aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2016-06-26 08:30:46 -0400
committerLee Jones <lee.jones@linaro.org>2016-06-29 05:16:29 -0400
commit4dc03d0abb3a27cf5842a52c796fe4e3d9541985 (patch)
tree8612ceb579dd24e7a1d6cef40fc93928026129fc
parent53b34b8d8860833bc672b6deb77a1769b2f79b5b (diff)
mfd: smsc-ece1099: Return directly after a function failure in smsc_i2c_probe()
This issue was detected by using the Coccinelle software. Return directly if a call of the function "devm_regmap_init_i2c" or "regmap_write" failed. Delete the jump label "err" then. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r--drivers/mfd/smsc-ece1099.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mfd/smsc-ece1099.c b/drivers/mfd/smsc-ece1099.c
index 2aaf89fa66c3..cd18c09827ef 100644
--- a/drivers/mfd/smsc-ece1099.c
+++ b/drivers/mfd/smsc-ece1099.c
@@ -46,10 +46,8 @@ static int smsc_i2c_probe(struct i2c_client *i2c,
46 } 46 }
47 47
48 smsc->regmap = devm_regmap_init_i2c(i2c, &smsc_regmap_config); 48 smsc->regmap = devm_regmap_init_i2c(i2c, &smsc_regmap_config);
49 if (IS_ERR(smsc->regmap)) { 49 if (IS_ERR(smsc->regmap))
50 ret = PTR_ERR(smsc->regmap); 50 return PTR_ERR(smsc->regmap);
51 goto err;
52 }
53 51
54 i2c_set_clientdata(i2c, smsc); 52 i2c_set_clientdata(i2c, smsc);
55 smsc->dev = &i2c->dev; 53 smsc->dev = &i2c->dev;
@@ -68,7 +66,7 @@ static int smsc_i2c_probe(struct i2c_client *i2c,
68 66
69 ret = regmap_write(smsc->regmap, SMSC_CLK_CTRL, smsc->clk); 67 ret = regmap_write(smsc->regmap, SMSC_CLK_CTRL, smsc->clk);
70 if (ret) 68 if (ret)
71 goto err; 69 return ret;
72 70
73#ifdef CONFIG_OF 71#ifdef CONFIG_OF
74 if (i2c->dev.of_node) 72 if (i2c->dev.of_node)
@@ -76,7 +74,6 @@ static int smsc_i2c_probe(struct i2c_client *i2c,
76 NULL, NULL, &i2c->dev); 74 NULL, NULL, &i2c->dev);
77#endif 75#endif
78 76
79err:
80 return ret; 77 return ret;
81} 78}
82 79