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

Commit 5815f555 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcmcia: 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 5f32c314

sound/pcmcia/pdaudiocf/pdaudiocf.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -112,7 +112,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link) 
		return -ENODEV; /* disabled explicitly */

		return -ENODEV; /* disabled explicitly */





	/* ok, create a card instance */

	/* ok, create a card instance */

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

	err = snd_card_new(&link->dev, index[i], id[i], THIS_MODULE,

			   0, &card);

	if (err < 0) {

	if (err < 0) {

		snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");

		snd_printk(KERN_ERR "pdacf: cannot create a card instance\n");

		return err;

		return err;
@@ -131,8 +132,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link) 
		return err;

		return err;

	}

	}





	snd_card_set_dev(card, &link->dev);



	pdacf->index = i;

	pdacf->index = i;

	card_list[i] = card;

	card_list[i] = card;

sound/pcmcia/vx/vxpocket.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link) 
		goto failed;

		goto failed;





	chip->dev = &link->dev;

	chip->dev = &link->dev;

	snd_card_set_dev(chip->card, chip->dev);





	if (snd_vxpocket_assign_resources(chip, link->resource[0]->start,

	if (snd_vxpocket_assign_resources(chip, link->resource[0]->start,

						link->irq) < 0)

						link->irq) < 0)
@@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev) 
		return -ENODEV; /* disabled explicitly */

		return -ENODEV; /* disabled explicitly */





	/* ok, create a card instance */

	/* ok, create a card instance */

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

	err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE,

			   0, &card);

	if (err < 0) {

	if (err < 0) {

		snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");

		snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n");

		return err;

		return err;