diff options
author | Helen Koike <helen.koike@collabora.co.uk> | 2016-06-23 15:23:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-06-26 07:28:13 -0400 |
commit | 39088c251c69d3b7b288e30228aed06e1d339da5 (patch) | |
tree | c34ea84b1ca78bfe2a53e07f4325dc7d43763db5 /sound | |
parent | 6d2de5ab4328718302c54b20222c6b1a574c3fce (diff) |
ASoC: tpa6130a2: Remove goto err_gpio
Replace goto err_gpio by return ret
Signed-off-by: Helen Koike <helen.koike@collabora.co.uk>
Tested-by: Sebastian Reichel <sre@kernel.org>
Reviewed-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/tpa6130a2.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c index 9da1dd12f839..f1ea052a822e 100644 --- a/sound/soc/codecs/tpa6130a2.c +++ b/sound/soc/codecs/tpa6130a2.c | |||
@@ -256,7 +256,7 @@ static int tpa6130a2_probe(struct i2c_client *client, | |||
256 | if (ret < 0) { | 256 | if (ret < 0) { |
257 | dev_err(dev, "Failed to request power GPIO (%d)\n", | 257 | dev_err(dev, "Failed to request power GPIO (%d)\n", |
258 | data->power_gpio); | 258 | data->power_gpio); |
259 | goto err_gpio; | 259 | return ret; |
260 | } | 260 | } |
261 | gpio_direction_output(data->power_gpio, 0); | 261 | gpio_direction_output(data->power_gpio, 0); |
262 | } | 262 | } |
@@ -277,12 +277,12 @@ static int tpa6130a2_probe(struct i2c_client *client, | |||
277 | if (IS_ERR(data->supply)) { | 277 | if (IS_ERR(data->supply)) { |
278 | ret = PTR_ERR(data->supply); | 278 | ret = PTR_ERR(data->supply); |
279 | dev_err(dev, "Failed to request supply: %d\n", ret); | 279 | dev_err(dev, "Failed to request supply: %d\n", ret); |
280 | goto err_gpio; | 280 | return ret; |
281 | } | 281 | } |
282 | 282 | ||
283 | ret = tpa6130a2_power(data, true); | 283 | ret = tpa6130a2_power(data, true); |
284 | if (ret != 0) | 284 | if (ret != 0) |
285 | goto err_gpio; | 285 | return ret; |
286 | 286 | ||
287 | 287 | ||
288 | /* Read version */ | 288 | /* Read version */ |
@@ -294,13 +294,10 @@ static int tpa6130a2_probe(struct i2c_client *client, | |||
294 | /* Disable the chip */ | 294 | /* Disable the chip */ |
295 | ret = tpa6130a2_power(data, false); | 295 | ret = tpa6130a2_power(data, false); |
296 | if (ret != 0) | 296 | if (ret != 0) |
297 | goto err_gpio; | 297 | return ret; |
298 | 298 | ||
299 | return devm_snd_soc_register_component(&client->dev, | 299 | return devm_snd_soc_register_component(&client->dev, |
300 | &tpa6130a2_component_driver, NULL, 0); | 300 | &tpa6130a2_component_driver, NULL, 0); |
301 | |||
302 | err_gpio: | ||
303 | return ret; | ||
304 | } | 301 | } |
305 | 302 | ||
306 | static const struct i2c_device_id tpa6130a2_id[] = { | 303 | static const struct i2c_device_id tpa6130a2_id[] = { |