[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 2433b77..531f8ba 100644
--- a/sound/mips/Kconfig
+++ b/sound/mips/Kconfig
@@ -8,7 +8,6 @@
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 f150cced..6d8f8b3e 100644
--- a/sound/mips/au1x00.c
+++ b/sound/mips/au1x00.c
@@ -663,11 +663,6 @@
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 ef022a8..079e22a 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -7,7 +7,6 @@
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 @@
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 @@
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 c271049..5549334 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1079,9 +1079,6 @@
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 0fa482c..14b1277 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1740,9 +1740,6 @@
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 012c636..293108e 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2664,9 +2664,6 @@
/* /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;