From 874b8d422e26e21dd432657e25f679c75440c1bc Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 29 Jan 2014 14:22:20 +0100 Subject: ALSA: usb: Convert to snd_card_new() with a device pointer Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai --- sound/usb/6fire/chip.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sound/usb/6fire') 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, snd_printk(KERN_ERR PREFIX "can't set first interface.\n"); return -EIO; } - ret = snd_card_create(index[regidx], id[regidx], THIS_MODULE, - sizeof(struct sfire_chip), &card); + ret = snd_card_new(&intf->dev, index[regidx], id[regidx], + THIS_MODULE, sizeof(struct sfire_chip), &card); if (ret < 0) { snd_printk(KERN_ERR PREFIX "cannot create alsa card.\n"); return ret; @@ -134,7 +134,6 @@ static int usb6fire_chip_probe(struct usb_interface *intf, strcpy(card->shortname, "TerraTec DMX6FireUSB"); sprintf(card->longname, "%s at %d:%d", card->shortname, device->bus->busnum, device->devnum); - snd_card_set_dev(card, &intf->dev); chip = card->private_data; chips[regidx] = chip; -- cgit v1.2.3