Commit 874b8d42 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 60c5772b

sound/usb/6fire/chip.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

sound/usb/caiaq/device.c

+3 −3
Original line number Diff line number Diff line
@@ -418,7 +418,8 @@ 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,

	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;

sound/usb/card.c

+6 −4
Original line number Diff line number Diff line
@@ -328,7 +328,8 @@ static void remove_trailing_spaces(char *str) 
/*

 * create a chip instance and set its names.

 */

static int snd_usb_audio_create(struct usb_device *dev, int idx,

static int snd_usb_audio_create(struct usb_interface *intf,

				struct usb_device *dev, int idx,

				const struct snd_usb_audio_quirk *quirk,

				struct snd_usb_audio **rchip)

{
@@ -354,7 +355,8 @@ static int snd_usb_audio_create(struct usb_device *dev, int idx, 
		return -ENXIO;

	}



	err = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card);

	err = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE,

			   0, &card);

	if (err < 0) {

		snd_printk(KERN_ERR "cannot create card instance %d\n", idx);

		return err;
@@ -513,10 +515,10 @@ snd_usb_audio_probe(struct usb_device *dev, 
			if (enable[i] && ! usb_chip[i] &&

			    (vid[i] == -1 || vid[i] == USB_ID_VENDOR(id)) &&

			    (pid[i] == -1 || pid[i] == USB_ID_PRODUCT(id))) {

				if (snd_usb_audio_create(dev, i, quirk, &chip) < 0) {

				if (snd_usb_audio_create(intf, dev, i, quirk,

							 &chip) < 0) {

					goto __error;

				}

				snd_card_set_dev(chip->card, &intf->dev);

				chip->pm_intf = intf;

				break;

			}

sound/usb/hiface/chip.c

+5 −5
Original line number Diff line number Diff line
@@ -64,7 +64,8 @@ struct hiface_vendor_quirk { 
	u8 extra_freq;

};



static int hiface_chip_create(struct usb_device *device, int idx,

static int hiface_chip_create(struct usb_interface *intf,

			      struct usb_device *device, int idx,

			      const struct hiface_vendor_quirk *quirk,

			      struct hiface_chip **rchip)

{
@@ -76,7 +77,8 @@ static int hiface_chip_create(struct usb_device *device, int idx, 
	*rchip = NULL;



	/* if we are here, card can be registered in alsa. */

	ret = snd_card_create(index[idx], id[idx], THIS_MODULE, sizeof(*chip), &card);

	ret = snd_card_new(&intf->dev, index[idx], id[idx], THIS_MODULE,

			   sizeof(*chip), &card);

	if (ret < 0) {

		dev_err(&device->dev, "cannot create alsa card.\n");

		return ret;
@@ -132,12 +134,10 @@ static int hiface_chip_probe(struct usb_interface *intf, 
		goto err;

	}



	ret = hiface_chip_create(device, i, quirk, &chip);

	ret = hiface_chip_create(intf, device, i, quirk, &chip);

	if (ret < 0)

		goto err;



	snd_card_set_dev(chip->card, &intf->dev);



	ret = hiface_pcm_init(chip, quirk ? quirk->extra_freq : 0);

	if (ret < 0)

		goto err_chip_destroy;

sound/usb/misc/ua101.c

+3 −4
Original line number Diff line number Diff line
@@ -1243,7 +1243,8 @@ static int ua101_probe(struct usb_interface *interface, 
		mutex_unlock(&devices_mutex);

		return -ENOENT;

	}

	err = snd_card_create(index[card_index], id[card_index], THIS_MODULE,

	err = snd_card_new(&interface->dev,

			   index[card_index], id[card_index], THIS_MODULE,

			   sizeof(*ua), &card);

	if (err < 0) {

		mutex_unlock(&devices_mutex);
@@ -1283,8 +1284,6 @@ static int ua101_probe(struct usb_interface *interface, 
		}

	}



	snd_card_set_dev(card, &interface->dev);



	err = detect_usb_format(ua);

	if (err < 0)

		goto probe_error;