Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebfbd2b8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
parent fa8174db

sound/mips/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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.

sound/mips/au1x00.c

+0 −5
Original line number Diff line number Diff line
@@ -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;

sound/sparc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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.

sound/sparc/amd7930.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

sound/sparc/cs4231.c

+0 −3
Original line number Diff line number Diff line
@@ -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;