Skip to contentSkip to conversation

ASoC: Simplify pm860x_probe error handling

PATCH In review Axel Lin 2 participants 2 messages Nov 30, 2010

Subsystems (2)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 ASoC: Simplify pm860x_probe error handling

Simplify pm860x_probe error handling and return actual error code we got.

---
 sound/soc/codecs/88pm860x-codec.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
sound/soc/codecs/88pm860x-codec.c +5 -7
index 7e4d880..08e15de 100644
@@ -1358,7 +1358,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 					   pm860x->name[i], pm860x);
 		if (ret < 0) {
 			dev_err(codec->dev, "Failed to request IRQ!\n");
-			goto out_irq;
+			goto out;
 		}
 	}
 
@@ -1369,7 +1369,7 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 	if (ret < 0) {
 		dev_err(codec->dev, "Failed to fill register cache: %d\n",
 			ret);
-		goto out_codec;
+		goto out;
 	}
 
 	snd_soc_add_controls(codec, pm860x_snd_controls,
@@ -1379,12 +1379,10 @@ static int pm860x_probe(struct snd_soc_codec *codec)
 	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 	return 0;
 
-out_codec:
-	i = 3;
-out_irq:
-	for (; i >= 0; i--)
+out:
+	while (--i >= 0)
 		free_irq(pm860x->irq[i], pm860x);
-	return -EINVAL;
+	return ret;
 }
 
 static int pm860x_remove(struct snd_soc_codec *codec)
Signature · 1 line
1.7.2
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Axel Lin

Simplify pm860x_probe error handling and return actual error code we got.

---
 sound/soc/codecs/88pm860x-codec.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk