提交 ebfbd2b8 编写于 作者: T Takashi Iwai 提交者: Jaroslav Kysela

[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: NTakashi Iwai <tiwai@suse.de>
上级 fa8174db
...@@ -8,7 +8,6 @@ config SND_AU1X00 ...@@ -8,7 +8,6 @@ config SND_AU1X00
depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND depends on (SOC_AU1000 || SOC_AU1100 || SOC_AU1500) && SND
select SND_PCM select SND_PCM
select SND_AC97_CODEC select SND_AC97_CODEC
select SND_GENERIC_DRIVER
help help
ALSA Sound driver for the Au1x00's AC97 port. ALSA Sound driver for the Au1x00's AC97 port.
......
...@@ -663,11 +663,6 @@ au1000_init(void) ...@@ -663,11 +663,6 @@ au1000_init(void)
strcpy(card->shortname, "AMD Au1000-AC97"); strcpy(card->shortname, "AMD Au1000-AC97");
sprintf(card->longname, "AMD Au1000--AC97 ALSA Driver"); 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) { if ((err = snd_card_register(card)) < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
......
...@@ -7,7 +7,6 @@ config SND_SUN_AMD7930 ...@@ -7,7 +7,6 @@ config SND_SUN_AMD7930
tristate "Sun AMD7930" tristate "Sun AMD7930"
depends on SBUS && SND depends on SBUS && SND
select SND_PCM select SND_PCM
select SND_GENERIC_DRIVER
help help
Say Y here to include support for AMD7930 sound device on Sun. Say Y here to include support for AMD7930 sound device on Sun.
...@@ -18,7 +17,6 @@ config SND_SUN_CS4231 ...@@ -18,7 +17,6 @@ config SND_SUN_CS4231
tristate "Sun CS4231" tristate "Sun CS4231"
depends on SND depends on SND
select SND_PCM select SND_PCM
select SND_GENERIC_DRIVER
help help
Say Y here to include support for CS4231 sound device on Sun. Say Y here to include support for CS4231 sound device on Sun.
...@@ -29,7 +27,6 @@ config SND_SUN_DBRI ...@@ -29,7 +27,6 @@ config SND_SUN_DBRI
tristate "Sun DBRI" tristate "Sun DBRI"
depends on SND && SBUS depends on SND && SBUS
select SND_PCM select SND_PCM
select SND_GENERIC_DRIVER
help help
Say Y here to include support for DBRI sound device on Sun. Say Y here to include support for DBRI sound device on Sun.
......
...@@ -1079,9 +1079,6 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev) ...@@ -1079,9 +1079,6 @@ static int __init amd7930_attach(int prom_node, struct sbus_dev *sdev)
if ((err = snd_amd7930_mixer(amd)) < 0) if ((err = snd_amd7930_mixer(amd)) < 0)
goto out_err; goto out_err;
if ((err = snd_card_set_generic_dev(card)) < 0)
goto out_err;
if ((err = snd_card_register(card)) < 0) if ((err = snd_card_register(card)) < 0)
goto out_err; goto out_err;
......
...@@ -1740,9 +1740,6 @@ static int cs4231_attach_finish(snd_card_t *card, cs4231_t *chip) ...@@ -1740,9 +1740,6 @@ static int cs4231_attach_finish(snd_card_t *card, cs4231_t *chip)
if ((err = snd_cs4231_timer(chip)) < 0) if ((err = snd_cs4231_timer(chip)) < 0)
goto out_err; goto out_err;
if ((err = snd_card_set_generic_dev(card)) < 0)
goto out_err;
if ((err = snd_card_register(card)) < 0) if ((err = snd_card_register(card)) < 0)
goto out_err; goto out_err;
......
...@@ -2664,9 +2664,6 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev) ...@@ -2664,9 +2664,6 @@ static int __init dbri_attach(int prom_node, struct sbus_dev *sdev)
/* /proc file handling */ /* /proc file handling */
snd_dbri_proc(dbri); snd_dbri_proc(dbri);
if ((err = snd_card_set_generic_dev(card)) < 0)
goto _err;
if ((err = snd_card_register(card)) < 0) if ((err = snd_card_register(card)) < 0)
goto _err; goto _err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册