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

Commit bee1bb19 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: mips: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7d13211c

sound/mips/au1x00.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -601,7 +601,7 @@ static int au1000_ac97_probe(struct platform_device *pdev) 
	struct snd_ac97_bus *pbus;

	struct snd_ac97_bus *pbus;

	struct snd_ac97_template ac97;

	struct snd_ac97_template ac97;





	err = snd_card_create(-1, "AC97", THIS_MODULE,

	err = snd_card_new(&pdev->dev, -1, "AC97", THIS_MODULE,

			   sizeof(struct snd_au1000), &card);

			   sizeof(struct snd_au1000), &card);

	if (err < 0)

	if (err < 0)

		return err;

		return err;

sound/mips/hal2.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -880,7 +880,7 @@ static int hal2_probe(struct platform_device *pdev) 
	struct snd_hal2 *chip;

	struct snd_hal2 *chip;

	int err;

	int err;





	err = snd_card_create(index, id, THIS_MODULE, 0, &card);

	err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -889,7 +889,6 @@ static int hal2_probe(struct platform_device *pdev) 
		snd_card_free(card);

		snd_card_free(card);

		return err;

		return err;

	}

	}

	snd_card_set_dev(card, &pdev->dev);





	err = hal2_pcm_create(chip);

	err = hal2_pcm_create(chip);

	if (err < 0) {

	if (err < 0) {

sound/mips/sgio2audio.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -920,7 +920,7 @@ static int snd_sgio2audio_probe(struct platform_device *pdev) 
	struct snd_sgio2audio *chip;

	struct snd_sgio2audio *chip;

	int err;

	int err;





	err = snd_card_create(index, id, THIS_MODULE, 0, &card);

	err = snd_card_new(&pdev->dev, index, id, THIS_MODULE, 0, &card);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -929,7 +929,6 @@ static int snd_sgio2audio_probe(struct platform_device *pdev) 
		snd_card_free(card);

		snd_card_free(card);

		return err;

		return err;

	}

	}

	snd_card_set_dev(card, &pdev->dev);





	err = snd_sgio2audio_new_pcm(chip);

	err = snd_sgio2audio_new_pcm(chip);

	if (err < 0) {

	if (err < 0) {