diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:48:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 08:14:09 +0100 |
| commit | e735688875208fa2c0bec3be6692941e701c48a8 (patch) | |
| tree | 4e24136a49d244a62e4e4faddd1f62e910e6d2ef /drivers/media/pci/cx88/cx88-alsa.c | |
| parent | HID: prodikeys: Convert to snd_card_new() with a device pointer (diff) | |
| download | linux-e735688875208fa2c0bec3be6692941e701c48a8.tar.xz linux-e735688875208fa2c0bec3be6692941e701c48a8.zip | |
[media] Convert to snd_card_new() with a device pointer
Also remove superfluous snd_card_set_dev() calls.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/media/pci/cx88/cx88-alsa.c')
| -rw-r--r-- | drivers/media/pci/cx88/cx88-alsa.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index d014206e7176..a72579a9f67f 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c @@ -852,8 +852,6 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci, chip->irq = pci->irq; synchronize_irq(chip->irq); - snd_card_set_dev(card, &pci->dev); - *rchip = chip; *core_ptr = core; @@ -876,8 +874,8 @@ static int cx88_audio_initdev(struct pci_dev *pci, return (-ENOENT); } - err = snd_card_create(index[devno], id[devno], THIS_MODULE, - sizeof(snd_cx88_card_t), &card); + err = snd_card_new(&pci->dev, index[devno], id[devno], THIS_MODULE, + sizeof(snd_cx88_card_t), &card); if (err < 0) return err; |