Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1433043
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 2/6] mfd: twl-core: Refactoring for add_numbered_child() |
| Date | 2016-06-28 17:10 +0200 |
| Message-ID | <rP2Od-hD-3@gated-at.bofh.it> (permalink) |
| References | (3 earlier) <rzg8O-u7-13@gated-at.bofh.it> <rzkcp-3oC-5@gated-at.bofh.it> <rHJGG-7U2-15@gated-at.bofh.it> <rOis1-3vu-13@gated-at.bofh.it> <rOiBH-3AL-15@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Sun, 26 Jun 2016, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sun, 26 Jun 2016 13:03:59 +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>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> ---
> drivers/mfd/twl-core.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
Applied, thanks.
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index 9458c6d..a49d3db 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -631,7 +631,7 @@ add_numbered_child(unsigned mod_no, const char *name, int num,
> 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;
> }
> }
>
> @@ -644,21 +644,22 @@ add_numbered_child(unsigned mod_no, const char *name, int num,
> status = platform_device_add_resources(pdev, r, irq1 ? 2 : 1);
> if (status < 0) {
> dev_dbg(&pdev->dev, "can't add irqs\n");
> - goto err;
> + goto put_device;
> }
> }
>
> status = platform_device_add(pdev);
> - if (status == 0)
> - device_init_wakeup(&pdev->dev, can_wakeup);
> + if (status)
> + goto put_device;
> +
> + device_init_wakeup(&pdev->dev, can_wakeup);
>
> -err:
> - if (status < 0) {
> - platform_device_put(pdev);
> - dev_err(&twl->client->dev, "can't add %s dev\n", name);
> - return ERR_PTR(status);
> - }
> return &pdev->dev;
> +
> +put_device:
> + platform_device_put(pdev);
> + dev_err(&twl->client->dev, "failed to add device %s\n", name);
> + return ERR_PTR(status);
> }
>
> static inline struct device *add_child(unsigned mod_no, const char *name,
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/6] mfd: Fine-tuning for three function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:40 +0200
[PATCH 1/6] mfd: twl-core: Return directly after a failed platform_device_alloc() in add_numbered_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
Re: [PATCH 1/6] mfd: twl-core: Return directly after a failed platform_device_alloc() in add_numbered_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
[PATCH 2/6] mfd: twl-core: Refactoring for add_numbered_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
Re: [PATCH 2/6] mfd: twl-core: Refactoring for add_numbered_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
[PATCH 3/6] mfd: dm355evm_msp: Return directly after a failed platform_device_alloc() in add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 15:50 +0200
[PATCH 5/6] mfd: smsc-ece1099: Delete an unnecessary variable initialisation in smsc_i2c_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
[PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-28 17:50 +0200
Re: [PATCH 4/6] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-28 18:40 +0200
[PATCH] mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-30 22:20 +0200
Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Joe Perches <joe@perches.com> - 2016-06-30 22:50 +0200
Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-06-30 23:00 +0200
Re: mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-01 16:50 +0200
Re: mfd: dm355evm_msp: Refactoring for add_child() Joe Perches <joe@perches.com> - 2016-07-01 18:30 +0200
Re: [PATCH] mfd: dm355evm_msp: Refactoring for add_child() Lee Jones <lee.jones@linaro.org> - 2016-07-01 11:20 +0200
Re: mfd: dm355evm_msp: Refactoring for add_child() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-07-01 17:00 +0200
[PATCH 6/6] mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-06-26 16:00 +0200
Re: [PATCH 0/6] mfd: Fine-tuning for three function implementations Lee Jones <lee.jones@linaro.org> - 2016-06-28 17:10 +0200
csiph-web