[1/3] ALSA: sgio2audio: Use common error handling code in two functions

Commit Message

SF Markus Elfring Nov. 11, 2017, 7:21 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Sat, 11 Nov 2017 19:56:07 +0100

Add jump targets so that a bit of exception handling can be better reused
at the end of these functions.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <[e-mail]>
---
 sound/mips/sgio2audio.c | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

Patch

diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 71c942162c25..62715a01f507 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -893,18 +893,19 @@  static int snd_sgio2audio_create(struct snd_card *card,
 
 	/* initialize the AD1843 codec */
 	err = ad1843_init(&chip->ad1843);
-	if (err < 0) {
-		snd_sgio2audio_free(chip);
-		return err;
-	}
+	if (err < 0)
+		goto free_chip;
 
 	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-	if (err < 0) {
-		snd_sgio2audio_free(chip);
-		return err;
-	}
+	if (err < 0)
+		goto free_chip;
+
 	*rchip = chip;
 	return 0;
+
+free_chip:
+	snd_sgio2audio_free(chip);
+	return err;
 }
 
 static int snd_sgio2audio_probe(struct platform_device *pdev)
@@ -918,21 +919,16 @@  static int snd_sgio2audio_probe(struct platform_device *pdev)
 		return err;
 
 	err = snd_sgio2audio_create(card, &chip);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
 
 	err = snd_sgio2audio_new_pcm(chip);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
+
 	err = snd_sgio2audio_new_mixer(chip);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
 
 	strcpy(card->driver, "SGI O2 Audio");
 	strcpy(card->shortname, "SGI O2 Audio");
@@ -942,12 +938,15 @@  static int snd_sgio2audio_probe(struct platform_device *pdev)
 		MACEISA_AUDIO3_MERR_IRQ);
 
 	err = snd_card_register(card);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
+
 	platform_set_drvdata(pdev, card);
 	return 0;
+
+free_card:
+	snd_card_free(card);
+	return err;
 }
 
 static int snd_sgio2audio_remove(struct platform_device *pdev)