Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 09:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/media: Convert to snd_card_create()

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

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-01-12 15:17:09 +01:00
parent 2fa51107c9
commit 758021bfa9
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/cx88/cx88-alsa.c
View File

@ -803,9 +803,10 @@ static int __devinit cx88_audio_initdev(struct pci_dev *pci,
return (-ENOENT); return (-ENOENT);
} }
card = snd_card_new(index[devno], id[devno], THIS_MODULE, sizeof(snd_cx88_card_t)); err = snd_card_create(index[devno], id[devno], THIS_MODULE,
if (!card) sizeof(snd_cx88_card_t), &card);
return (-ENOMEM); if (err < 0)
return err;
card->private_free = snd_cx88_dev_free; card->private_free = snd_cx88_dev_free;

7
drivers/media/video/em28xx/em28xx-audio.c
View File

@ -438,9 +438,10 @@ static int em28xx_audio_init(struct em28xx *dev)
printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus " printk(KERN_INFO "em28xx-audio.c: Copyright (C) 2006 Markus "
"Rechberger\n"); "Rechberger\n");
card = snd_card_new(index[devnr], "Em28xx Audio", THIS_MODULE, 0); err = snd_card_create(index[devnr], "Em28xx Audio", THIS_MODULE, 0,
if (card == NULL) &card);
return -ENOMEM; if (err < 0)
return err;
spin_lock_init(&adev->slock); spin_lock_init(&adev->slock);
err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm); err = snd_pcm_new(card, "Em28xx Audio", 0, 0, 1, &pcm);

8
drivers/media/video/saa7134/saa7134-alsa.c
View File

@ -990,10 +990,10 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
if (!enable[devnum]) if (!enable[devnum])
return -ENODEV; return -ENODEV;
card = snd_card_new(index[devnum], id[devnum], THIS_MODULE, sizeof(snd_card_saa7134_t)); err = snd_card_create(index[devnum], id[devnum], THIS_MODULE,
sizeof(snd_card_saa7134_t), &card);
if (card == NULL) if (err < 0)
return -ENOMEM; return err;
strcpy(card->driver, "SAA7134"); strcpy(card->driver, "SAA7134");