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

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

ALSA: sh: 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 10768797

sound/sh/aica.c

+2 −3
Original line number Diff line number Diff line
@@ -608,8 +608,8 @@ static int snd_aica_probe(struct platform_device *devptr) 
	dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);

	if (unlikely(!dreamcastcard))

		return -ENOMEM;

	err = snd_card_create(index, SND_AICA_DRIVER, THIS_MODULE, 0,

			      &dreamcastcard->card);

	err = snd_card_new(&devptr->dev, index, SND_AICA_DRIVER,

			   THIS_MODULE, 0, &dreamcastcard->card);

	if (unlikely(err < 0)) {

		kfree(dreamcastcard);

		return err;
@@ -624,7 +624,6 @@ static int snd_aica_probe(struct platform_device *devptr) 
	err = snd_aicapcmchip(dreamcastcard, 0);

	if (unlikely(err < 0))

		goto freedreamcast;

	snd_card_set_dev(dreamcastcard->card, &devptr->dev);

	dreamcastcard->timer.data = 0;

	dreamcastcard->channel = NULL;

	/* Add basic controls */

sound/sh/sh_dac_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int snd_sh_dac_probe(struct platform_device *devptr) 
	struct snd_card *card;

	int err;



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

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

	if (err < 0) {

			snd_printk(KERN_ERR "cannot allocate the card\n");

			return err;