diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 17:22:20 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 14:18:00 +0400 |
| commit | 874b8d422e26e21dd432657e25f679c75440c1bc (patch) | |
| tree | e88cbcfc629fc791e9310a968cdcd90bddbc4f10 /sound/usb/caiaq/device.c | |
| parent | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (diff) | |
| download | linux-874b8d422e26e21dd432657e25f679c75440c1bc.tar.xz | |
ALSA: usb: 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 'sound/usb/caiaq/device.c')
| -rw-r--r-- | sound/usb/caiaq/device.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/caiaq/device.c b/sound/usb/caiaq/device.c index bc55f708a696..b871ba407e4e 100644 --- a/sound/usb/caiaq/device.c +++ b/sound/usb/caiaq/device.c @@ -418,8 +418,9 @@ static int create_card(struct usb_device *usb_dev, if (devnum >= SNDRV_CARDS) return -ENODEV; - err = snd_card_create(index[devnum], id[devnum], THIS_MODULE, - sizeof(struct snd_usb_caiaqdev), &card); + err = snd_card_new(&intf->dev, + index[devnum], id[devnum], THIS_MODULE, + sizeof(struct snd_usb_caiaqdev), &card); if (err < 0) return err; @@ -429,7 +430,6 @@ static int create_card(struct usb_device *usb_dev, cdev->chip.usb_id = USB_ID(le16_to_cpu(usb_dev->descriptor.idVendor), le16_to_cpu(usb_dev->descriptor.idProduct)); spin_lock_init(&cdev->spinlock); - snd_card_set_dev(card, &intf->dev); *cardp = card; return 0; |