| Message ID | 75c1cc23-3a2d-db78-d0f2-b5934b18e828@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, 26 Jun 2016, SF Markus Elfring wrote: > 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); > Remove this line too. > -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)
>> @@ -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); >> > > Remove this line too. Do you propose the deletion of a blank line here? Did you skip this update suggestion while the other patches were finally accepted? Regards, Markus -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 28 Jun 2016, SF Markus Elfring wrote: > >> @@ -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); > >> > > > > Remove this line too. > > Do you propose the deletion of a blank line here? Yes. > Did you skip this update suggestion while the other patches were finally accepted? I don't know what this means. The other patches in the set have been accepted. Please fix this one and send it again on its own.
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)