[ALSA] Remove snd_card_generic_dev()

Remove the obsolete snd_card_generic_dev().
CONFIG_SND_GENERIC_DRIVER is also removed from Kconfig.

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

diff --git a/sound/mips/Kconfig b/sound/mips/Kconfig
index 2433b7727404a061b80c815957c86048c1fa3f55..531f8ba96a71ae40d05b810cc6b42e36fe2ec165 100644 (file)
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -8,7 +8,6 @@ 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 f150cced9fc16e5ce6c66ecd833ebde1d00420db..6d8f8b3eabd0ef3bc09cf458ed29b3302b14b0ed 100644 (file)
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -663,11 +663,6 @@ au1000_init(void)
        strcpy(card->shortname, "AMD Au1000-AC97");
        sprintf(card->longname, "AMD Au1000--AC97 ALSA Driver");
 
-       if ((err = snd_card_set_generic_dev(card)) < 0) {
-               snd_card_free(card);
-               return err;
-       }
-
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);
                return err;

diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index ef022a846b06b602878b90a5f7758f30cdd727bb..079e22af074c08cf45bdc0bc0559f327869dcce8 100644 (file)
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -7,7 +7,6 @@ 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.
 
@@ -18,7 +17,6 @@ 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.
 
@@ -29,7 +27,6 @@ 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 c2710499b83a6f92da9cb987bd61685d67b4bb32..55493340f467322582a4c5d9662a7d29acb3ef7b 100644 (file)
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1079,9 +1079,6 @@ 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 0fa482c9110b582607b5a575816a5daaec80e6b6..14b1277bc83a61d374d801f2178fa58bc320716b 100644 (file)
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1740,9 +1740,6 @@ 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 012c636019c7078f35c4dccd47721957b3fee7af..293108ee72994272797e62ce3d19d4ec0cb4c957 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2664,9 +2664,6 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
        /* /proc file handling */
        snd_dbri_proc(dbri);
 
-       if ((err = snd_card_set_generic_dev(card)) < 0)
-               goto _err;
-
        if ((err = snd_card_register(card)) < 0)
                goto _err;