lkml.org 
[lkml]   [2016]   [Jan]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] mfd-dm355evm_msp: One function call less in add_child() after error detection
    The subject format is wrong and the summary itself isn't very informative.

    On Tue, 29 Dec 2015, SF Markus Elfring wrote:
    > From: Markus Elfring <elfring@users.sourceforge.net>
    > Date: Tue, 29 Dec 2015 13:56:42 +0100

    This patch format is wrong, please consider using `git format-patch`
    and `git send-email`.

    > The platform_device_put() function was called in one case by the
    > add_child() function during error handling even if the passed
    > variable "pdev" contained a null pointer.
    >
    > Implementation details could be improved by the adjustment of jump targets
    > according to the Linux coding style convention.
    >
    > This issue was detected by using the Coccinelle software.
    >
    > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    > ---
    > drivers/mfd/dm355evm_msp.c | 21 ++++++++++-----------
    > 1 file changed, 10 insertions(+), 11 deletions(-)
    >
    > diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c
    > index bc90efe..e4aa1b8 100644
    > --- a/drivers/mfd/dm355evm_msp.c
    > +++ b/drivers/mfd/dm355evm_msp.c
    > @@ -202,7 +202,7 @@ static struct device *add_child(struct i2c_client *client, const char *name,
    > if (!pdev) {
    > dev_dbg(&client->dev, "can't alloc dev\n");

    Make this dev_err().

    > status = -ENOMEM;
    > - goto err;
    > + goto report_failure;

    Return here.

    > }
    >
    > device_init_wakeup(&pdev->dev, can_wakeup);
    > @@ -212,7 +212,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;
    > }
    > }
    >
    > @@ -225,19 +225,18 @@ 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);
    > - }
    > - return &pdev->dev;
    > + if (!status)

    Be more consistent here.

    Reverse the condition and return an instead, as you do above.

    > + return &pdev->dev;
    > +put_device:
    > + platform_device_put(pdev);
    > +report_failure:
    > + dev_err(&client->dev, "can't add %s dev\n", name);

    This isn't a very friendly error message. Better to convert the
    dev_dbg() calls to dev_err() and tell the user what the problem was.

    > + return ERR_PTR(status);
    > }
    >
    > static int add_children(struct i2c_client *client)

    --
    Lee Jones
    Linaro STMicroelectronics Landing Team Lead
    Linaro.org │ Open source software for ARM SoCs
    Follow Linaro: Facebook | Twitter | Blog

    \
     
     \ /
      Last update: 2016-01-12 13:41    [W:4.034 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site