Commit d6ca69d8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Minor tidy up in line6_probe() 



Move the check of multi configurations before snd_card_new() as a
short path, and reduce superfluous pointer references.

Tested-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent aca514b8

sound/usb/line6/driver.c

+9 −11
Original line number Diff line number Diff line
@@ -495,6 +495,10 @@ int line6_probe(struct usb_interface *interface, 
	if (WARN_ON(data_size < sizeof(*line6)))

		return -EINVAL;



	/* we don't handle multiple configurations */

	if (usbdev->descriptor.bNumConfigurations != 1)

		return -ENODEV;



	ret = snd_card_new(&interface->dev,

			   SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1,

			   THIS_MODULE, data_size, &card);
@@ -508,10 +512,10 @@ int line6_probe(struct usb_interface *interface, 
	line6->usbdev = usbdev;

	line6->ifcdev = &interface->dev;



	strcpy(card->id, line6->properties->id);

	strcpy(card->id, properties->id);

	strcpy(card->driver, DRIVER_NAME);

	strcpy(card->shortname, line6->properties->name);

	sprintf(card->longname, "Line 6 %s at USB %s", line6->properties->name,

	strcpy(card->shortname, properties->name);

	sprintf(card->longname, "Line 6 %s at USB %s", properties->name,

		dev_name(line6->ifcdev));

	card->private_free = line6_destruct;
@@ -520,12 +524,6 @@ int line6_probe(struct usb_interface *interface, 
	/* increment reference counters: */

	usb_get_dev(usbdev);



	/* we don't handle multiple configurations */

	if (usbdev->descriptor.bNumConfigurations != 1) {

		ret = -ENODEV;

		goto error;

	}



	/* initialize device info: */

	dev_info(&interface->dev, "Line 6 %s found\n", properties->name);
@@ -555,7 +553,7 @@ int line6_probe(struct usb_interface *interface, 
	/* creation of additional special files should go here */



	dev_info(&interface->dev, "Line 6 %s now attached\n",

		 line6->properties->name);

		 properties->name);



	return 0;