Commit 12865cac authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai
Browse files

ALSA: line6: Pass driver name to line6_probe() 



Provide a unique name for each driver instead of using "line6usb" for
all of them.  This will allow for different configurations based on the
driver type.

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

sound/usb/line6/driver.c

+2 −1
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ static int line6_init_cap_control(struct usb_line6 *line6) 
*/

int line6_probe(struct usb_interface *interface,

		const struct usb_device_id *id,

		const char *driver_name,

		const struct line6_properties *properties,

		int (*private_init)(struct usb_line6 *, const struct usb_device_id *id),

		size_t data_size)
@@ -511,7 +512,7 @@ int line6_probe(struct usb_interface *interface, 
	line6->ifcdev = &interface->dev;



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

	strcpy(card->driver, DRIVER_NAME);

	strcpy(card->driver, driver_name);

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

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

		dev_name(line6->ifcdev));

sound/usb/line6/driver.h

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include "midi.h"



#define DRIVER_NAME "line6usb"



#define USB_INTERVALS_PER_SECOND 1000



/* Fallback USB interval and max packet size values */
@@ -168,6 +166,7 @@ extern int line6_write_data(struct usb_line6 *line6, int address, void *data, 


int line6_probe(struct usb_interface *interface,

		const struct usb_device_id *id,

		const char *driver_name,

		const struct line6_properties *properties,

		int (*private_init)(struct usb_line6 *, const struct usb_device_id *id),

		size_t data_size);

sound/usb/line6/pod.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static const struct line6_properties pod_properties_table[] = { 
static int pod_probe(struct usb_interface *interface,

		     const struct usb_device_id *id)

{

	return line6_probe(interface, id,

	return line6_probe(interface, id, "Line6-POD",

			   &pod_properties_table[id->driver_info],

			   pod_init, sizeof(struct usb_line6_pod));

}

sound/usb/line6/podhd.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static const struct line6_properties podhd_properties_table[] = { 
static int podhd_probe(struct usb_interface *interface,

		       const struct usb_device_id *id)

{

	return line6_probe(interface, id,

	return line6_probe(interface, id, "Line6-PODHD",

			   &podhd_properties_table[id->driver_info],

			   podhd_init, sizeof(struct usb_line6));

}

sound/usb/line6/toneport.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static const struct line6_properties toneport_properties_table[] = { 
static int toneport_probe(struct usb_interface *interface,

			  const struct usb_device_id *id)

{

	return line6_probe(interface, id,

	return line6_probe(interface, id, "Line6-TonePort",

			   &toneport_properties_table[id->driver_info],

			   toneport_init, sizeof(struct usb_line6_toneport));

}