[ALSA] Add snd_card_set_generic_dev() call

ARM,SA11xx UDA1341 driver,Generic drivers,MPU401 UART,MIPS
MIPS AU1x00 driver,PPC,PPC PowerMac driver,SPARC,SPARC AMD7930 driver
SPARC cs4231 driver,SPARC DBRI driver
- Added snd_card_set_generic_dev() call.
- Added SND_GENERIC_DRIVER to Kconfig.
- Clean up the error path in probe if necessary.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

16 files changed, 84 insertions, 38 deletions

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index 2e4a5e0d16db..0864a7ce414d 100644
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -7,6 +7,7 @@ config SND_SA11XX_UDA1341
         tristate "SA11xx UDA1341TS driver (iPaq H3600)"
         depends on ARCH_SA1100 && SND && L3
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here if you have a Compaq iPaq H3x00 handheld computer
           and want to use its Philips UDA 1341 audio chip.
diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 174bc032d1ad..813959f185e6 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -21,7 +21,7 @@
  *                              merged HAL layer (patches from Brian)
  */
 
-/* $Id: sa11xx-uda1341.c,v 1.21 2005/01/28 19:34:04 tiwai Exp $ */
+/* $Id: sa11xx-uda1341.c,v 1.22 2005/09/05 16:17:58 tiwai Exp $ */
 
 /***************************************************************************************************
 *
@@ -946,6 +946,9 @@ static int __init sa11xx_uda1341_init(void)
         strcpy(card->shortname, "H3600 UDA1341TS");
         sprintf(card->longname, "Compaq iPAQ H3600 with Philips UDA1341TS");
         
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto nodev;
+
         if ((err = snd_card_register(card)) == 0) {
                 printk( KERN_INFO "iPAQ audio support initialized\n" );
                 return 0;
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 3b2bee19e2c0..efcb4eb2d1a0 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -29,6 +29,7 @@ config SND_DUMMY
         tristate "Dummy (/dev/null) soundcard"
         depends on SND
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include the dummy driver.  This driver does
           nothing, but emulates various mixer controls and PCM devices.
@@ -44,6 +45,7 @@ config SND_VIRMIDI
         depends on SND_SEQUENCER
         select SND_TIMER
         select SND_RAWMIDI
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include the virtual MIDI driver.  This driver
           allows to connect applications using raw MIDI devices to
@@ -59,6 +61,7 @@ config SND_MTPAV
         depends on SND
         select SND_TIMER
         select SND_RAWMIDI
+        select SND_GENERIC_DRIVER
         help
           To use a MOTU MidiTimePiece AV multiport MIDI adapter
           connected to the parallel port, say Y here and make sure that
@@ -72,6 +75,7 @@ config SND_SERIAL_U16550
         depends on SND
         select SND_TIMER
         select SND_RAWMIDI
+        select SND_GENERIC_DRIVER
         help
           To include support for MIDI serial port interfaces, say Y here
           and read <file:Documentation/sound/alsa/serial-u16550.txt>.
@@ -88,6 +92,7 @@ config SND_MPU401
         tristate "Generic MPU-401 UART driver"
         depends on SND
         select SND_MPU401_UART
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include support for MIDI ports compatible with
           the Roland MPU-401 interface in UART mode.
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index a61640cf7ae7..977d98d26a81 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -600,6 +600,10 @@ static int __init snd_card_dummy_probe(int dev)
         strcpy(card->driver, "Dummy");
         strcpy(card->shortname, "Dummy");
         sprintf(card->longname, "Dummy %i", dev + 1);
+
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto __nodev;
+
         if ((err = snd_card_register(card)) == 0) {
                 snd_dummy_cards[dev] = card;
                 return 0;
diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index cb36ecb78697..54e2ff9b5ca1 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -77,20 +77,26 @@ static int snd_mpu401_create(int dev, snd_card_t **rcard)
                 strcat(card->longname, "polled");
         }
 
-        if (snd_mpu401_uart_new(card, 0,
-                                MPU401_HW_MPU401,
-                                port[dev], 0,
-                                irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) {
+        if ((err = snd_mpu401_uart_new(card, 0,
+                                       MPU401_HW_MPU401,
+                                       port[dev], 0,
+                                       irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) {
                 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
-                snd_card_free(card);
-                return -ENODEV;
-        }
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
+                goto _err;
         }
+
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto _err;
+
+        if ((err = snd_card_register(card)) < 0)
+                goto _err;
+
         *rcard = card;
         return 0;
+
+ _err:
+        snd_card_free(card);
+        return err;
 }
 
 static int __devinit snd_mpu401_probe(int dev)
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 1280a57c49eb..b8199d20be82 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -757,6 +757,9 @@ static int __init alsa_card_mtpav_init(void)
         if (err < 0)
                 goto __error;
 
+        if ((err = snd_card_set_generic_dev(mtp_card->card)) < 0)
+                goto __error;
+
         err = snd_card_register(mtp_card->card);        // don't snd_card_register until AFTER all cards reources done!
 
         //printk("snd_card_register returned %d\n", err);
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 986df35fb829..fd3bb9dd1d24 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -928,15 +928,11 @@ static int __init snd_serial_probe(int dev)
                                         base[dev],
                                         adaptor[dev],
                                         droponfull[dev],
-                                        &uart)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                        &uart)) < 0)
+                goto _err;
 
-        if ((err = snd_uart16550_rmidi(uart, 0, outs[dev], ins[dev], &uart->rmidi)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_uart16550_rmidi(uart, 0, outs[dev], ins[dev], &uart->rmidi)) < 0)
+                goto _err;
 
         sprintf(card->longname, "%s at 0x%lx, irq %d speed %d div %d outs %d ins %d adaptor %s droponfull %d",
                 card->shortname,
@@ -949,12 +945,18 @@ static int __init snd_serial_probe(int dev)
                 adaptor_names[uart->adaptor],
                 uart->drop_on_full);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto _err;
+
+        if ((err = snd_card_register(card)) < 0)
+                goto _err;
+
         snd_serial_cards[dev] = card;
         return 0;
+
+ _err:
+        snd_card_free(card);
+        return err;
 }
 
 static int __init alsa_card_serial_init(void)
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c
index 5937711e9505..af12185ab8a2 100644
--- a/sound/drivers/virmidi.c
+++ b/sound/drivers/virmidi.c
@@ -116,6 +116,10 @@ static int __init snd_card_virmidi_probe(int dev)
         strcpy(card->driver, "VirMIDI");
         strcpy(card->shortname, "VirMIDI");
         sprintf(card->longname, "Virtual MIDI Card %i", dev + 1);
+
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto __nodev;
+
         if ((err = snd_card_register(card)) == 0) {
                 snd_virmidi_cards[dev] = card;
                 return 0;
diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig
index 531f8ba96a71..2433b7727404 100644
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -8,6 +8,7 @@ config SND_AU1X00
         depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND
         select SND_PCM
         select SND_AC97_CODEC
+        select SND_GENERIC_DRIVER
         help
           ALSA Sound driver for the Au1x00's AC97 port.
 
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c
index c20522b02134..3f9684f1d1d2 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -667,6 +667,11 @@ au1000_init(void)
         strcpy(au1000->card->shortname, "Au1000-AC97");
         sprintf(au1000->card->longname, "AMD Au1000--AC97 ALSA Driver");
 
+        if ((err = snd_card_set_generic_dev(au1000->card)) < 0) {
+                snd_card_free(au1000->card);
+                return err;
+        }
+
         if ((err = snd_card_register(au1000->card)) < 0) {
                 snd_card_free(au1000->card);
                 return err;
diff --git a/sound/ppc/Kconfig b/sound/ppc/Kconfig
index 75213bf4d567..bda5bc4e6148 100644
--- a/sound/ppc/Kconfig
+++ b/sound/ppc/Kconfig
@@ -13,6 +13,7 @@ config SND_POWERMAC
         tristate "PowerMac (AWACS, DACA, Burgundy, Tumbler, Keywest)"
         depends on SND && I2C && INPUT && PPC_PMAC
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include support for the integrated sound device.
 
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c
index 231f6432ea6d..a6d8cbf4064f 100644
--- a/sound/ppc/powermac.c
+++ b/sound/ppc/powermac.c
@@ -131,6 +131,9 @@ static int __init snd_pmac_probe(void)
         if (enable_beep)
                 snd_pmac_attach_beep(chip);
 
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto __error;
+
         if ((err = snd_card_register(card)) < 0)
                 goto __error;
 
diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index 25a8a558ef92..09ab138646a6 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -7,6 +7,7 @@ config SND_SUN_AMD7930
         tristate "Sun AMD7930"
         depends on SBUS && SND
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include support for AMD7930 sound device on Sun.
 
@@ -17,6 +18,7 @@ config SND_SUN_CS4231
         tristate "Sun CS4231"
         depends on SND
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include support for CS4231 sound device on Sun.
 
@@ -27,6 +29,7 @@ config SND_SUN_DBRI
         tristate "Sun DBRI"
         depends on SND && SBUS
         select SND_PCM
+        select SND_GENERIC_DRIVER
         help
           Say Y here to include support for DBRI sound device on Sun.
 
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index bd8a850e93ea..ed0d5f2f0888 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1088,6 +1088,9 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev)
         if ((err = snd_amd7930_mixer(amd)) < 0)
                 goto out_err;
 
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto out_err;
+
         if ((err = snd_card_register(card)) < 0)
                 goto out_err;
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 36f9fe4d7bea..bd169f541181 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1915,6 +1915,9 @@ static int cs4231_attach_finish(snd_card_t *card, cs4231_t *chip)
         if ((err = snd_cs4231_timer(chip)) < 0)
                 goto out_err;
 
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto out_err;
+
         if ((err = snd_card_register(card)) < 0)
                 goto out_err;
 
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 941c7b1e7ebb..a56f81bb0049 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2657,26 +2657,20 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
         }
 
         dbri = (snd_dbri_t *) card->private_data;
-        if ((err = snd_dbri_pcm(dbri)) < 0) {
-                snd_dbri_free(dbri);
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_dbri_pcm(dbri)) < 0)
+                goto _err;
 
-        if ((err = snd_dbri_mixer(dbri)) < 0) {
-                snd_dbri_free(dbri);
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_dbri_mixer(dbri)) < 0)
+                goto _err;
 
         /* /proc file handling */
         snd_dbri_proc(dbri);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_dbri_free(dbri);
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_card_set_generic_dev(card)) < 0)
+                goto _err;
+
+        if ((err = snd_card_register(card)) < 0)
+                goto _err;
 
         printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
                dev, dbri->regs,
@@ -2684,6 +2678,11 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
         dev++;
 
         return 0;
+
+ _err:
+        snd_dbri_free(dbri);
+        snd_card_free(card);
+        return err;
 }
 
 /* Probe for the dbri chip and then attach the driver. */