diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 08:22:20 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-12 05:18:00 -0500 |
commit | 874b8d422e26e21dd432657e25f679c75440c1bc (patch) | |
tree | e88cbcfc629fc791e9310a968cdcd90bddbc4f10 /sound/usb/6fire | |
parent | 60c5772b50fe8ce947685cfe3a80b9bf6ea92831 (diff) |
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/6fire')
-rw-r--r-- | sound/usb/6fire/chip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/usb/6fire/chip.c b/sound/usb/6fire/chip.c index 66edc4a7917f..e0fe0d92db8c 100644 --- a/sound/usb/6fire/chip.c +++ b/sound/usb/6fire/chip.c | |||
@@ -124,8 +124,8 @@ static int usb6fire_chip_probe(struct usb_interface *intf, | |||
124 | snd_printk(KERN_ERR PREFIX "can't set first interface.\n"); | 124 | snd_printk(KERN_ERR PREFIX "can't set first interface.\n"); |
125 | return -EIO; | 125 | return -EIO; |
126 | } | 126 | } |
127 | ret = snd_card_create(index[regidx], id[regidx], THIS_MODULE, | 127 | ret = snd_card_new(&intf->dev, index[regidx], id[regidx], |
128 | sizeof(struct sfire_chip), &card); | 128 | THIS_MODULE, sizeof(struct sfire_chip), &card); |
129 | if (ret < 0) { | 129 | if (ret < 0) { |
130 | snd_printk(KERN_ERR PREFIX "cannot create alsa card.\n"); | 130 | snd_printk(KERN_ERR PREFIX "cannot create alsa card.\n"); |
131 | return ret; | 131 | return ret; |
@@ -134,7 +134,6 @@ static int usb6fire_chip_probe(struct usb_interface *intf, | |||
134 | strcpy(card->shortname, "TerraTec DMX6FireUSB"); | 134 | strcpy(card->shortname, "TerraTec DMX6FireUSB"); |
135 | sprintf(card->longname, "%s at %d:%d", card->shortname, | 135 | sprintf(card->longname, "%s at %d:%d", card->shortname, |
136 | device->bus->busnum, device->devnum); | 136 | device->bus->busnum, device->devnum); |
137 | snd_card_set_dev(card, &intf->dev); | ||
138 | 137 | ||
139 | chip = card->private_data; | 138 | chip = card->private_data; |
140 | chips[regidx] = chip; | 139 | chips[regidx] = chip; |