[PATCH v3 2/2] ASoC: tpa6130a2: Remove goto err_gpio

From: Helen Koike
Date: Thu Jun 23 2016 - 15:24:03 EST


Replace goto err_gpio by return ret

Signed-off-by: Helen Koike <helen.koike@xxxxxxxxxxxxxxx>
Tested-by: Sebastian Reichel <sre@xxxxxxxxxx>
Reviewed-by: Sebastian Reichel <sre@xxxxxxxxxx>

---
Changes since v1:
- this is a new patch in the series

Changes since v2:
- Add tested-by and reviewed-by from Sebastian

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 9da1dd1..f1ea052 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,
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);
}
@@ -277,12 +277,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 */
@@ -294,13 +294,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