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: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c
index e2a2603a1ca39d57b801379d43d89ec5efbf83c0..626b0c3244cf2f1fb54eac7f5ad1c5069f3b017b 100644 (file)
--- a/sound/usb/line6/driver.c
+++ b/sound/usb/line6/driver.c
@@ -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));

diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h
index 2276b78f35629545504fffcaf400c06a0392c782..92a662a0469e36dcdc347ed3d419cfd541f71e3d 100644 (file)
--- a/sound/usb/line6/driver.h
+++ b/sound/usb/line6/driver.h
@@ -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);

diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c
index feec7070eacae9c5489611901332ba61d65693c2..09017bc9615b8657cca6843ef7c1314167b2d69d 100644 (file)
--- a/sound/usb/line6/pod.c
+++ b/sound/usb/line6/pod.c
@@ -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));
 }

diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 9c3c7441fd115c25bbb1121a4c3977d51e54668f..63dcaef41ac3a173c4ae6c30939b48a1e7cf9852 100644 (file)
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -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));
 }

diff --git a/sound/usb/line6/toneport.c b/sound/usb/line6/toneport.c
index 2420d2fc8aa27afb88c01684b525bd5e9cbef934..1a0a485b66543d10f83b6856ba8894496533f52e 100644 (file)
--- a/sound/usb/line6/toneport.c
+++ b/sound/usb/line6/toneport.c
@@ -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));
 }

diff --git a/sound/usb/line6/variax.c b/sound/usb/line6/variax.c
index b1c1de65d58443ab7992390762f5f81fbeb8f5d5..ddc23ddf0750ae39c64f5563389297db119ebcc9 100644 (file)
--- a/sound/usb/line6/variax.c
+++ b/sound/usb/line6/variax.c
@@ -283,7 +283,7 @@ static const struct line6_properties variax_properties_table[] = {
 static int variax_probe(struct usb_interface *interface,
                        const struct usb_device_id *id)
 {
-       return line6_probe(interface, id,
+       return line6_probe(interface, id, "Line6-Variax",
                           &variax_properties_table[id->driver_info],
                           variax_init, sizeof(struct usb_line6_variax));
 }