linux-kernel - [PATCH v3 2/2] ASoC: tpa6130a2: Remove goto err

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 23 Jun 2016 16:23:14 -0300
From:	Helen Koike <helen.koike@...labora.co.uk>
To:	Sebastian Reichel <sre@...nel.org>
Cc:	lgirdwood@...il.com, broonie@...nel.org, peter.ujfalusi@...com,
	jarkko.nikula@...mer.com, lars@...afoo.de, k.kozlowski@...sung.com,
	alsa-devel@...a-project.org, linux-kernel@...r.kernel.org,
	linux-omap@...r.kernel.org, perex@...ex.cz, tiwai@...e.com,
	cphealy@...il.com, Helen Koike <helen.koike@...labora.co.uk>
Subject: [PATCH v3 2/2] ASoC: tpa6130a2: Remove goto err_gpio

Replace goto err_gpio by return ret

Signed-off-by: Helen Koike <helen.koike@...labora.co.uk>
Tested-by: Sebastian Reichel <sre@...nel.org>
Reviewed-by: Sebastian Reichel <sre@...nel.org>

---
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