summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/keyspan.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-20 21:15:16 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 16:47:48 -0700
commit269bda1c123c7caf88e1deb2264f9086f0344192 (patch)
treec83d9944e0acdc40c9040cbccfb9ec7d606bdd2c /drivers/usb/serial/keyspan.h
parent502b95c1cc9e2c855a26f90fc999c5211b8ba957 (diff)
[PATCH] USB Serial: move name to driver structure
This fixes up a lot of problems in sysfs with some of the usb serial drivers, they had incorrect driver names. Also saves a tiny ammount of memory. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/keyspan.h')
-rw-r--r--drivers/usb/serial/keyspan.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 124d46e76a2e..5cfc13b5e56f 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -573,9 +573,9 @@ static struct usb_device_id keyspan_4port_ids[] = {
static struct usb_serial_driver keyspan_pre_device = {
.driver = {
.owner = THIS_MODULE,
+ .name = "keyspan_no_firm",
},
- .name = "Keyspan - (without firmware)",
- .short_name = "keyspan_no_firm",
+ .description = "Keyspan - (without firmware)",
.id_table = keyspan_pre_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
@@ -587,9 +587,9 @@ static struct usb_serial_driver keyspan_pre_device = {
static struct usb_serial_driver keyspan_1port_device = {
.driver = {
.owner = THIS_MODULE,
+ .name = "keyspan_1",
},
- .name = "Keyspan 1 port adapter",
- .short_name = "keyspan_1",
+ .description = "Keyspan 1 port adapter",
.id_table = keyspan_1port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
@@ -614,9 +614,9 @@ static struct usb_serial_driver keyspan_1port_device = {
static struct usb_serial_driver keyspan_2port_device = {
.driver = {
.owner = THIS_MODULE,
+ .name = "keyspan_2",
},
- .name = "Keyspan 2 port adapter",
- .short_name = "keyspan_2",
+ .description = "Keyspan 2 port adapter",
.id_table = keyspan_2port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = NUM_DONT_CARE,
@@ -641,9 +641,9 @@ static struct usb_serial_driver keyspan_2port_device = {
static struct usb_serial_driver keyspan_4port_device = {
.driver = {
.owner = THIS_MODULE,
+ .name = "keyspan_4",
},
- .name = "Keyspan 4 port adapter",
- .short_name = "keyspan_4",
+ .description = "Keyspan 4 port adapter",
.id_table = keyspan_4port_ids,
.num_interrupt_in = NUM_DONT_CARE,
.num_bulk_in = 5,