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

Commit 758021bf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

drivers/media: Convert to snd_card_create() 



Convert from snd_card_new() to the new snd_card_create() function.

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

drivers/media/video/cx88/cx88-alsa.c

+4 −3
Original line number Diff line number Diff line
@@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci, 
		return (-ENOENT);

	}



	card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t));

	if (!card)

		return (-ENOMEM);

	err = snd_card_create(index[devno], id[devno], THIS_MODULE,

			      sizeof(snd_cx88_card_t), &card);

	if (err < 0)

		return err;



	card->private_free = snd_cx88_dev_free;

drivers/media/video/em28xx/em28xx-audio.c

+4 −3
Original line number Diff line number Diff line
@@ -438,9 +438,10 @@ static int em28xx_audio_init(struct em28xx *dev) 
	printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "

			 "Rechberger\n");



	card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0);

	if (card == NULL)

		return -ENOMEM;

	err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,

			      &card);

	if (err < 0)

		return err;



	spin_lock_init(&adev->slock);

	err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);

drivers/media/video/saa7134/saa7134-alsa.c

+4 −4
Original line number Diff line number Diff line
@@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) 
	if (!enable[devnum])

		return -ENODEV;



	card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t));



	if (card == NULL)

		return -ENOMEM;

	err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,

			      sizeof(snd_card_saa7134_t), &card);

	if (err < 0)

		return err;



	strcpy(card->driver, "SAA7134");