lkml.org 
[lkml]   [2016]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child()
    From
    Date
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 26 Jun 2016 13:56:58 +0200

    Adjust jump targets according to the Linux coding style convention.
    Another check for the variable "status" can be omitted then at the end.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/mfd/dm355evm_msp.c | 18 ++++++++++--------
    1 file changed, 10 insertions(+), 8 deletions(-)

    diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
    index 270e19c..baf6075 100644
    --- a/drivers/mfd/dm355evm_msp.c
    +++ b/drivers/mfd/dm355evm_msp.c
    @@ -209,7 +209,7 @@ static struct device *add_child(struct i2c_client *client, const char *name,
    status = platform_device_add_data(pdev, pdata, pdata_len);
    if (status < 0) {
    dev_dbg(&pdev->dev, "can't add platform_data\n");
    - goto err;
    + goto put_device;
    }
    }

    @@ -222,19 +222,21 @@ static struct device *add_child(struct i2c_client *client, const char *name,
    status = platform_device_add_resources(pdev, &r, 1);
    if (status < 0) {
    dev_dbg(&pdev->dev, "can't add irq\n");
    - goto err;
    + goto put_device;
    }
    }

    status = platform_device_add(pdev);

    -err:
    - if (status < 0) {
    - platform_device_put(pdev);
    - dev_err(&client->dev, "can't add %s dev\n", name);
    - return ERR_PTR(status);
    - }
    + if (status)
    + goto put_device;
    +
    return &pdev->dev;
    +
    +put_device:
    + platform_device_put(pdev);
    + dev_err(&client->dev, "failed to add device %s\n", name);
    + return ERR_PTR(status);
    }

    static int add_children(struct i2c_client *client)
    --
    2.9.0
    \
     
     \ /
      Last update: 2016-06-26 16:41    [W:4.067 / U:1.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site