All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_probe()
  2017-11-13 19:40 ` SF Markus Elfring
  (?)
@ 2017-11-18 21:15 ` SF Markus Elfring
  -1 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-11-18 21:15 UTC (permalink / raw)
  To: alsa-devel, Jaroslav Kysela, Takashi Iwai; +Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 18 Nov 2017 22:10:19 +0100

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/pci/cs5530.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 0a8cf94c4858..674572edf2d2 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -269,23 +269,24 @@ static int snd_cs5530_probe(struct pci_dev *pci,
 		return err;
 
 	err = snd_cs5530_create(card, pci, &chip);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
 
 	strcpy(card->driver, "CS5530");
 	strcpy(card->shortname, "CS5530 Audio");
 	sprintf(card->longname, "%s at 0x%lx", card->shortname, chip->pci_base);
 
 	err = snd_card_register(card);
-	if (err < 0) {
-		snd_card_free(card);
-		return err;
-	}
+	if (err < 0)
+		goto free_card;
+
 	pci_set_drvdata(pci, card);
 	dev++;
 	return 0;
+
+free_card:
+	snd_card_free(card);
+	return err;
 }
 
 static struct pci_driver cs5530_driver = {
-- 
2.15.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_create()
@ 2017-11-13 19:40 ` SF Markus Elfring
  0 siblings, 0 replies; 6+ messages in thread
From: SF Markus Elfring @ 2017-11-13 19:40 UTC (permalink / raw)
  To: alsa-devel, Jaroslav Kysela, Takashi Iwai; +Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 13 Nov 2017 20:33:07 +0100

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

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/pci/cs5530.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/sound/pci/cs5530.c b/sound/pci/cs5530.c
index 0a8cf94c4858..88f253489075 100644
--- a/sound/pci/cs5530.c
+++ b/sound/pci/cs5530.c
@@ -124,8 +124,8 @@ static int snd_cs5530_create(struct snd_card *card,
 
 	chip = kzalloc(sizeof(*chip), GFP_KERNEL);
 	if (chip == NULL) {
-		pci_disable_device(pci);
-		return -ENOMEM;
+		err = -ENOMEM;
+		goto disable_device;
 	}
 
 	chip->card = card;
@@ -134,15 +134,14 @@ static int snd_cs5530_create(struct snd_card *card,
 	err = pci_request_regions(pci, "CS5530");
 	if (err < 0) {
 		kfree(chip); 
-		pci_disable_device(pci);
-		return err;
+		goto disable_device;
 	}
 	chip->pci_base = pci_resource_start(pci, 0);
 
 	mem = pci_ioremap_bar(pci, 0);
 	if (mem == NULL) {
-		snd_cs5530_free(chip);
-		return -EBUSY;
+		err = -EBUSY;
+		goto free_sound_chip;
 	}
 
 	map = readw(mem + 0x18);
@@ -163,8 +162,7 @@ static int snd_cs5530_create(struct snd_card *card,
 		dev_info(card->dev, "XpressAudio at 0x%lx\n", sb_base);
 	else {
 		dev_err(card->dev, "Could not find XpressAudio!\n");
-		snd_cs5530_free(chip);
-		return -ENODEV;
+		goto e_nodev;
 	}
 
 	if (map & (1<<5))
@@ -183,8 +181,7 @@ static int snd_cs5530_create(struct snd_card *card,
 		dma16 = 7;
 	else {
 		dev_err(card->dev, "No 16bit DMA enabled\n");
-		snd_cs5530_free(chip);
-		return -ENODEV;
+		goto e_nodev;
 	}
 
 	if (dma8 & 0x01)
@@ -195,8 +192,7 @@ static int snd_cs5530_create(struct snd_card *card,
 		dma8 = 3;
 	else {
 		dev_err(card->dev, "No 8bit DMA enabled\n");
-		snd_cs5530_free(chip);
-		return -ENODEV;
+		goto e_nodev;
 	}
 
 	if (irq & 1)
@@ -209,8 +205,7 @@ static int snd_cs5530_create(struct snd_card *card,
 		irq = 10;
 	else {
 		dev_err(card->dev, "SoundBlaster IRQ not set\n");
-		snd_cs5530_free(chip);
-		return -ENODEV;
+		goto e_nodev;
 	}
 
 	dev_info(card->dev, "IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, dma16);
@@ -219,32 +214,37 @@ static int snd_cs5530_create(struct snd_card *card,
 						dma16, SB_HW_CS5530, &chip->sb);
 	if (err < 0) {
 		dev_err(card->dev, "Could not create SoundBlaster\n");
-		snd_cs5530_free(chip);
-		return err;
+		goto free_sound_chip;
 	}
 
 	err = snd_sb16dsp_pcm(chip->sb, 0);
 	if (err < 0) {
 		dev_err(card->dev, "Could not create PCM\n");
-		snd_cs5530_free(chip);
-		return err;
+		goto free_sound_chip;
 	}
 
 	err = snd_sbmixer_new(chip->sb);
 	if (err < 0) {
 		dev_err(card->dev, "Could not create Mixer\n");
-		snd_cs5530_free(chip);
-		return err;
+		goto free_sound_chip;
 	}
 
 	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-	if (err < 0) {
-		snd_cs5530_free(chip);
-		return err;
-	}
+	if (err < 0)
+		goto free_sound_chip;
 
 	*rchip = chip;
 	return 0;
+
+disable_device:
+	pci_disable_device(pci);
+	return err;
+
+e_nodev:
+	err = -ENODEV;
+free_sound_chip:
+	snd_cs5530_free(chip);
+	return err;
 }
 
 static int snd_cs5530_probe(struct pci_dev *pci,
-- 
2.15.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-18 21:17 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-18 21:15 [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_probe() SF Markus Elfring
2017-11-18 21:15 ` SF Markus Elfring
2017-11-18 21:15 ` SF Markus Elfring
  -- strict thread matches above, loose matches on Subject: below --
2017-11-13 19:40 [PATCH] ALSA: cs5530: Use common error handling code in snd_cs5530_create() SF Markus Elfring
2017-11-13 19:40 ` SF Markus Elfring
2017-11-13 19:40 ` SF Markus Elfring

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.