ALSA: ymfpci: Use common error handling code in snd_ymfpci_create()

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

* The script "checkpatch.pl" pointed information out like the following.

  ERROR: do not use assignment in if condition

  Thus fix a few source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index edfd582480821a3682ce546b9b3cd73b9451288e..8ca2e41e58270044c1442eb8b5546688cd519c83 100644 (file)
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2399,59 +2399,60 @@ int snd_ymfpci_create(struct snd_card *card,
                dev_err(chip->card->dev,
                        "unable to grab memory region 0x%lx-0x%lx\n",
                        chip->reg_area_phys, chip->reg_area_phys + 0x8000 - 1);
-               snd_ymfpci_free(chip);
-               return -EBUSY;
+               err = -EBUSY;
+               goto free_chip;
        }
        if (request_irq(pci->irq, snd_ymfpci_interrupt, IRQF_SHARED,
                        KBUILD_MODNAME, chip)) {
                dev_err(chip->card->dev, "unable to grab IRQ %d\n", pci->irq);
-               snd_ymfpci_free(chip);
-               return -EBUSY;
+               err = -EBUSY;
+               goto free_chip;
        }
        chip->irq = pci->irq;
 
        snd_ymfpci_aclink_reset(pci);
        if (snd_ymfpci_codec_ready(chip, 0) < 0) {
-               snd_ymfpci_free(chip);
-               return -EIO;
+               err = -EIO;
+               goto free_chip;
        }
 
        err = snd_ymfpci_request_firmware(chip);
        if (err < 0) {
                dev_err(chip->card->dev, "firmware request failed: %d\n", err);
-               snd_ymfpci_free(chip);
-               return err;
+               goto free_chip;
        }
        snd_ymfpci_download_image(chip);
 
        udelay(100); /* seems we need a delay after downloading image.. */
 
        if (snd_ymfpci_memalloc(chip) < 0) {
-               snd_ymfpci_free(chip);
-               return -EIO;
+               err = -EIO;
+               goto free_chip;
        }
 
-       if ((err = snd_ymfpci_ac3_init(chip)) < 0) {
-               snd_ymfpci_free(chip);
-               return err;
-       }
+       err = snd_ymfpci_ac3_init(chip);
+       if (err < 0)
+               goto free_chip;
 
 #ifdef CONFIG_PM_SLEEP
        chip->saved_regs = kmalloc(YDSXGR_NUM_SAVED_REGS * sizeof(u32),
                                   GFP_KERNEL);
        if (chip->saved_regs == NULL) {
-               snd_ymfpci_free(chip);
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto free_chip;
        }
 #endif
 
-       if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
-               snd_ymfpci_free(chip);
-               return err;
-       }
+       err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+       if (err < 0)
+               goto free_chip;
 
        snd_ymfpci_proc_init(card, chip);
 
        *rchip = chip;
        return 0;
+
+free_chip:
+       snd_ymfpci_free(chip);
+       return err;
 }