diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 13:48:43 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 07:14:09 (GMT) |
commit | e735688875208fa2c0bec3be6692941e701c48a8 (patch) | |
tree | 4e24136a49d244a62e4e4faddd1f62e910e6d2ef /drivers/media/pci/cx25821 | |
parent | b9d4e7b0f612ecf6a0a29a046efc4828703f63c4 (diff) | |
download | linux-e735688875208fa2c0bec3be6692941e701c48a8.tar.xz |
[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/cx25821')
-rw-r--r-- | drivers/media/pci/cx25821/cx25821-alsa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c index b1e08c3..2dd5bca 100644 --- a/drivers/media/pci/cx25821/cx25821-alsa.c +++ b/drivers/media/pci/cx25821/cx25821-alsa.c @@ -645,8 +645,9 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev) return -ENOENT; } - err = snd_card_create(index[devno], id[devno], THIS_MODULE, - sizeof(struct cx25821_audio_dev), &card); + err = snd_card_new(&dev->pci->dev, index[devno], id[devno], + THIS_MODULE, + sizeof(struct cx25821_audio_dev), &card); if (err < 0) { pr_info("DEBUG ERROR: cannot create snd_card_new in %s\n", __func__); @@ -682,8 +683,6 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev) goto error; } - snd_card_set_dev(card, &chip->pci->dev); - strcpy(card->shortname, "cx25821"); sprintf(card->longname, "%s at 0x%lx irq %d", chip->dev->name, chip->iobase, chip->irq); |