Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1426837
| From | Helen Koike <helen.koike@collabora.co.uk> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 5/5] ASoC: tpa6130a2: Remove goto err_gpio |
| Date | 2016-06-20 19:20 +0200 |
| Message-ID | <rMb1E-2DX-47@gated-at.bofh.it> (permalink) |
| References | <rLlZ7-2TL-5@gated-at.bofh.it> <rMb1E-2DX-49@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Replace goto err_gpio by return ret
Signed-off-by: Helen Koike <helen.koike@collabora.co.uk>
---
Changes since v1:
- this is a new patch in the series
sound/soc/codecs/tpa6130a2.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index cc83870..a919308 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -255,7 +255,7 @@ static int tpa6130a2_probe(struct i2c_client *client,
if (ret < 0) {
dev_err(dev, "Failed to request power GPIO (%d)\n",
data->power_gpio);
- goto err_gpio;
+ return ret;
}
gpio_direction_output(data->power_gpio, 0);
}
@@ -276,12 +276,12 @@ static int tpa6130a2_probe(struct i2c_client *client,
if (IS_ERR(data->supply)) {
ret = PTR_ERR(data->supply);
dev_err(dev, "Failed to request supply: %d\n", ret);
- goto err_gpio;
+ return ret;
}
ret = tpa6130a2_power(data, true);
if (ret != 0)
- goto err_gpio;
+ return ret;
/* Read version */
@@ -293,13 +293,10 @@ static int tpa6130a2_probe(struct i2c_client *client,
/* Disable the chip */
ret = tpa6130a2_power(data, false);
if (ret != 0)
- goto err_gpio;
+ return ret;
return devm_snd_soc_register_component(&client->dev,
&tpa6130a2_component_driver, NULL, 0);
-
-err_gpio:
- return ret;
}
static const struct i2c_device_id tpa6130a2_id[] = {
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/4] ASoC: tpa6130a2: Add support for multiple instances Helen Koike <helen.koike@collabora.co.uk> - 2016-06-18 05:40 +0200
[PATCH 3/4] ASoC: tpa6130a2: Use snd soc volsw functions Helen Koike <helen.koike@collabora.co.uk> - 2016-06-18 05:40 +0200
Re: [PATCH 3/4] ASoC: tpa6130a2: Use snd soc volsw functions Sebastian Reichel <sre@kernel.org> - 2016-06-19 00:40 +0200
Re: [PATCH 0/4] ASoC: tpa6130a2: Add support for multiple instances Sebastian Reichel <sre@kernel.org> - 2016-06-18 12:50 +0200
Re: [PATCH 0/4] ASoC: tpa6130a2: Add support for multiple instances Sebastian Reichel <sre@kernel.org> - 2016-06-18 23:40 +0200
[PATCH v2 5/5] ASoC: tpa6130a2: Remove goto err_gpio Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:20 +0200
Re: [PATCH v2 5/5] ASoC: tpa6130a2: Remove goto err_gpio Sebastian Reichel <sre@kernel.org> - 2016-06-21 03:50 +0200
[PATCH v2 3/5] ASoC: tpa6130a2: Use snd soc volsw functions Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:30 +0200
Re: [PATCH v2 3/5] ASoC: tpa6130a2: Use snd soc volsw functions Sebastian Reichel <sre@kernel.org> - 2016-06-21 03:50 +0200
Applied "ASoC: tpa6130a2: Use snd soc volsw functions" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-23 16:40 +0200
[PATCH v2 4/5] ASoC: tpa6130a2: Add DAPM support Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:30 +0200
Re: [PATCH v2 4/5] ASoC: tpa6130a2: Add DAPM support Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 21:10 +0200
Re: [PATCH v2 4/5] ASoC: tpa6130a2: Add DAPM support Sebastian Reichel <sre@kernel.org> - 2016-06-21 03:50 +0200
Re: [PATCH v2 4/5] ASoC: tpa6130a2: Add DAPM support Lars-Peter Clausen <lars@metafoo.de> - 2016-06-20 21:50 +0200
Re: [PATCH v2 4/5] ASoC: tpa6130a2: Add DAPM support Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 22:20 +0200
[PATCH v2 1/5] ASoC: tpa6130a2: Register component Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:30 +0200
Applied "ASoC: tpa6130a2: Register component" to the asoc tree Mark Brown <broonie@kernel.org> - 2016-06-23 16:40 +0200
[PATCH v2 0/5] ASoC: tpa6130a2: Add support for multiple instances Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:30 +0200
[PATCH v2 2/5] ASoC: tap6130a2: Use regmap Helen Koike <helen.koike@collabora.co.uk> - 2016-06-20 19:30 +0200
Re: [PATCH v2 2/5] ASoC: tap6130a2: Use regmap Sebastian Reichel <sre@kernel.org> - 2016-06-21 03:50 +0200
Re: [PATCH 0/4] ASoC: tpa6130a2: Add support for multiple instances Sebastian Reichel <sre@kernel.org> - 2016-06-19 22:20 +0200
csiph-web