lkml.org 
[lkml]   [2006]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/11] uml ubd driver: reformat ubd_config
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    Pure whitespace and style fixes split out from subsequent patch. Some changes
    (err -> ret) don't make sense now, only later, but I split them out anyway since
    they cluttered the patch.

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---

    arch/um/drivers/ubd_kern.c | 31 ++++++++++++++++++++-----------
    1 files changed, 20 insertions(+), 11 deletions(-)

    diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
    index 1202592..48b2a4f 100644
    --- a/arch/um/drivers/ubd_kern.c
    +++ b/arch/um/drivers/ubd_kern.c
    @@ -709,27 +709,36 @@ out:

    static int ubd_config(char *str)
    {
    - int n, err;
    + int n, ret;

    str = kstrdup(str, GFP_KERNEL);
    - if(str == NULL){
    + if (str == NULL) {
    printk(KERN_ERR "ubd_config failed to strdup string\n");
    - return(1);
    + ret = 1;
    + goto out;
    }
    - err = ubd_setup_common(str, &n);
    - if(err){
    - kfree(str);
    - return(-1);
    + ret = ubd_setup_common(str, &n);
    + if (ret) {
    + ret = -1;
    + goto err_free;
    + }
    + if (n == -1) {
    + ret = 0;
    + goto out;
    }
    - if(n == -1) return(0);

    mutex_lock(&ubd_lock);
    - err = ubd_add(n);
    - if(err)
    + ret = ubd_add(n);
    + if (ret)
    ubd_devs[n].file = NULL;
    mutex_unlock(&ubd_lock);

    - return(err);
    +out:
    + return ret;
    +
    +err_free:
    + kfree(str);
    + goto out;
    }

    static int ubd_get_config(char *name, char *str, int size, char **error_out)
    Chiacchiera con i tuoi amici in tempo reale!
    http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-10-29 20:27    [W:0.026 / U:58.984 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site