diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2013-07-12 13:32:04 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-07-31 02:02:57 +0200 |
| commit | ecc8fa1c85853a7d8736a920b1b3611c2333a190 (patch) | |
| tree | 021f92bcdfeb38e385f88afa1efc964529fe8d3a /drivers/mfd/twl6040.c | |
| parent | 37aefe9f05a802a2f6f39642ae9f6ca8538df3a9 (diff) | |
| download | linux-ecc8fa1c85853a7d8736a920b1b3611c2333a190.tar.bz2 | |
mfd: twl6040: Cleanup in early error handling in probe function
The err: label is not needed we can just return instead of the jump there.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/twl6040.c')
| -rw-r--r-- | drivers/mfd/twl6040.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index 3bd110e7f518..4d8d3b74d4e3 100644 --- a/drivers/mfd/twl6040.c +++ b/drivers/mfd/twl6040.c @@ -533,16 +533,12 @@ static int twl6040_probe(struct i2c_client *client, twl6040 = devm_kzalloc(&client->dev, sizeof(struct twl6040), GFP_KERNEL); - if (!twl6040) { - ret = -ENOMEM; - goto err; - } + if (!twl6040) + return -ENOMEM; twl6040->regmap = devm_regmap_init_i2c(client, &twl6040_regmap_config); - if (IS_ERR(twl6040->regmap)) { - ret = PTR_ERR(twl6040->regmap); - goto err; - } + if (IS_ERR(twl6040->regmap)) + return PTR_ERR(twl6040->regmap); i2c_set_clientdata(client, twl6040); @@ -660,7 +656,7 @@ gpio_err: regulator_bulk_disable(TWL6040_NUM_SUPPLIES, twl6040->supplies); regulator_get_err: i2c_set_clientdata(client, NULL); -err: + return ret; } |