]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: tpa6130a2: Remove goto err_gpio
authorHelen Koike <helen.koike@collabora.co.uk>
Thu, 23 Jun 2016 19:23:14 +0000 (16:23 -0300)
committerMark Brown <broonie@kernel.org>
Sun, 26 Jun 2016 11:28:13 +0000 (12:28 +0100)
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>
sound/soc/codecs/tpa6130a2.c

index 9da1dd12f8398e691294b47119078419cb8053b4..f1ea052a822e1f584eb55cbc876b8e079e813ccd 100644 (file)
@@ -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[] = {