2014-02-14 09:56:30

by Sachin Kamat

Subject: [PATCH v2] mfd: wm8400-core: Remove unnecessary goto

Return directly to avoid redundant lines of code.

Signed-off-by: Sachin Kamat <[email protected]>
Acked-by: Lee Jones <[email protected]>
---
Changes since v1:
Changed (wm8400 == NULL) -> (!wm8400)
---
drivers/mfd/wm8400-core.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index d66d256551fb..e5eae751aa1b 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -161,31 +161,19 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct wm8400 *wm8400;
- int ret;

wm8400 = devm_kzalloc(&i2c->dev, sizeof(struct wm8400), GFP_KERNEL);
- if (wm8400 == NULL) {
- ret = -ENOMEM;
- goto err;
- }
+ if (!wm8400)
+ return -ENOMEM;

wm8400->regmap = devm_regmap_init_i2c(i2c, &wm8400_regmap_config);
- if (IS_ERR(wm8400->regmap)) {
- ret = PTR_ERR(wm8400->regmap);
- goto err;
- }
+ if (IS_ERR(wm8400->regmap))
+ return PTR_ERR(wm8400->regmap);

wm8400->dev = &i2c->dev;
i2c_set_clientdata(i2c, wm8400);

- ret = wm8400_init(wm8400, dev_get_platdata(&i2c->dev));
- if (ret != 0)
- goto err;
-
- return 0;
-
-err:
- return ret;
+ return wm8400_init(wm8400, dev_get_platdata(&i2c->dev));
}

static int wm8400_i2c_remove(struct i2c_client *i2c)
--
1.7.9.5

2014-02-14 11:31:22

by Lee Jones

Subject: Re: [PATCH v2] mfd: wm8400-core: Remove unnecessary goto

> Return directly to avoid redundant lines of code.
>
> Signed-off-by: Sachin Kamat <[email protected]>
> Acked-by: Lee Jones <[email protected]>
> ---
> Changes since v1:
> Changed (wm8400 == NULL) -> (!wm8400)
> ---
> drivers/mfd/wm8400-core.c | 22 +++++-----------------
> 1 file changed, 5 insertions(+), 17 deletions(-)

Nice little clean-up. Applied, thanks.

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