aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:47:48 -0400
commit269bda1c123c7caf88e1deb2264f9086f0344192 (patch)
treec83d9944e0acdc40c9040cbccfb9ec7d606bdd2c /drivers/usb
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')
-rw-r--r--drivers/usb/serial/airprime.c2
-rw-r--r--drivers/usb/serial/belkin_sa.c4
-rw-r--r--drivers/usb/serial/bus.c8
-rw-r--r--drivers/usb/serial/cp2101.c4
-rw-r--r--drivers/usb/serial/cyberjack.c4
-rw-r--r--drivers/usb/serial/cypress_m8.c8
-rw-r--r--drivers/usb/serial/digi_acceleport.c12
-rw-r--r--drivers/usb/serial/empeg.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c4
-rw-r--r--drivers/usb/serial/garmin_gps.c4
-rw-r--r--drivers/usb/serial/generic.c3
-rw-r--r--drivers/usb/serial/hp4x.c4
-rw-r--r--drivers/usb/serial/io_tables.h12
-rw-r--r--drivers/usb/serial/io_ti.c12
-rw-r--r--drivers/usb/serial/ipaq.c3
-rw-r--r--drivers/usb/serial/ipw.c4
-rw-r--r--drivers/usb/serial/ir-usb.c3
-rw-r--r--drivers/usb/serial/keyspan.h16
-rw-r--r--drivers/usb/serial/keyspan_pda.c12
-rw-r--r--drivers/usb/serial/kl5kusb105.c4
-rw-r--r--drivers/usb/serial/kobil_sct.c3
-rw-r--r--drivers/usb/serial/mct_u232.c4
-rw-r--r--drivers/usb/serial/omninet.c4
-rw-r--r--drivers/usb/serial/option.c4
-rw-r--r--drivers/usb/serial/pl2303.c2
-rw-r--r--drivers/usb/serial/safe_serial.c2
-rw-r--r--drivers/usb/serial/ti_usb_3410_5052.c10
-rw-r--r--drivers/usb/serial/usb-serial.c15
-rw-r--r--drivers/usb/serial/usb-serial.h12
-rw-r--r--drivers/usb/serial/visor.c18
-rw-r--r--drivers/usb/serial/whiteheat.c30
31 files changed, 115 insertions, 114 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index fbc5b9b44749..1f29d8837327 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -33,8 +33,8 @@ static struct usb_driver airprime_driver = {
33static struct usb_serial_driver airprime_device = { 33static struct usb_serial_driver airprime_device = {
34 .driver = { 34 .driver = {
35 .owner = THIS_MODULE, 35 .owner = THIS_MODULE,
36 .name = "airprime",
36 }, 37 },
37 .name = "airprime",
38 .id_table = id_table, 38 .id_table = id_table,
39 .num_interrupt_in = NUM_DONT_CARE, 39 .num_interrupt_in = NUM_DONT_CARE,
40 .num_bulk_in = NUM_DONT_CARE, 40 .num_bulk_in = NUM_DONT_CARE,
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index 4878961a0900..84bc0ee4f061 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -124,9 +124,9 @@ static struct usb_driver belkin_driver = {
124static struct usb_serial_driver belkin_device = { 124static struct usb_serial_driver belkin_device = {
125 .driver = { 125 .driver = {
126 .owner = THIS_MODULE, 126 .owner = THIS_MODULE,
127 .name = "belkin",
127 }, 128 },
128 .name = "Belkin / Peracom / GoHubs USB Serial Adapter", 129 .description = "Belkin / Peracom / GoHubs USB Serial Adapter",
129 .short_name = "belkin",
130 .id_table = id_table_combined, 130 .id_table = id_table_combined,
131 .num_interrupt_in = 1, 131 .num_interrupt_in = 1,
132 .num_bulk_in = 1, 132 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index b8364a8de7df..664139afcfa9 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -72,7 +72,7 @@ static int usb_serial_device_probe (struct device *dev)
72 tty_register_device (usb_serial_tty_driver, minor, dev); 72 tty_register_device (usb_serial_tty_driver, minor, dev);
73 dev_info(&port->serial->dev->dev, 73 dev_info(&port->serial->dev->dev,
74 "%s converter now attached to ttyUSB%d\n", 74 "%s converter now attached to ttyUSB%d\n",
75 driver->name, minor); 75 driver->description, minor);
76 76
77exit: 77exit:
78 return retval; 78 return retval;
@@ -104,7 +104,7 @@ exit:
104 minor = port->number; 104 minor = port->number;
105 tty_unregister_device (usb_serial_tty_driver, minor); 105 tty_unregister_device (usb_serial_tty_driver, minor);
106 dev_info(dev, "%s converter now disconnected from ttyUSB%d\n", 106 dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
107 driver->name, minor); 107 driver->description, minor);
108 108
109 return retval; 109 return retval;
110} 110}
@@ -113,10 +113,6 @@ int usb_serial_bus_register(struct usb_serial_driver *driver)
113{ 113{
114 int retval; 114 int retval;
115 115
116 if (driver->short_name)
117 driver->driver.name = (char *)driver->short_name;
118 else
119 driver->driver.name = (char *)driver->name;
120 driver->driver.bus = &usb_serial_bus_type; 116 driver->driver.bus = &usb_serial_bus_type;
121 driver->driver.probe = usb_serial_device_probe; 117 driver->driver.probe = usb_serial_device_probe;
122 driver->driver.remove = usb_serial_device_remove; 118 driver->driver.remove = usb_serial_device_remove;
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 81dd720a122b..c5334dd89b12 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -67,7 +67,7 @@ MODULE_DEVICE_TABLE (usb, id_table);
67 67
68static struct usb_driver cp2101_driver = { 68static struct usb_driver cp2101_driver = {
69 .owner = THIS_MODULE, 69 .owner = THIS_MODULE,
70 .name = "CP2101", 70 .name = "cp2101",
71 .probe = usb_serial_probe, 71 .probe = usb_serial_probe,
72 .disconnect = usb_serial_disconnect, 72 .disconnect = usb_serial_disconnect,
73 .id_table = id_table, 73 .id_table = id_table,
@@ -76,8 +76,8 @@ static struct usb_driver cp2101_driver = {
76static struct usb_serial_driver cp2101_device = { 76static struct usb_serial_driver cp2101_device = {
77 .driver = { 77 .driver = {
78 .owner = THIS_MODULE, 78 .owner = THIS_MODULE,
79 .name = "cp2101",
79 }, 80 },
80 .name = "CP2101",
81 .id_table = id_table, 81 .id_table = id_table,
82 .num_interrupt_in = 0, 82 .num_interrupt_in = 0,
83 .num_bulk_in = 0, 83 .num_bulk_in = 0,
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 3441bad74f7b..e581e4ae8483 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -86,9 +86,9 @@ static struct usb_driver cyberjack_driver = {
86static struct usb_serial_driver cyberjack_device = { 86static struct usb_serial_driver cyberjack_device = {
87 .driver = { 87 .driver = {
88 .owner = THIS_MODULE, 88 .owner = THIS_MODULE,
89 .name = "cyberjack",
89 }, 90 },
90 .name = "Reiner SCT Cyberjack USB card reader", 91 .description = "Reiner SCT Cyberjack USB card reader",
91 .short_name = "cyberjack",
92 .id_table = id_table, 92 .id_table = id_table,
93 .num_interrupt_in = 1, 93 .num_interrupt_in = 1,
94 .num_bulk_in = 1, 94 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index b4069af4d565..af9290ed257b 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -179,9 +179,9 @@ static unsigned int cypress_buf_get(struct cypress_buf *cb, char *buf, unsigne
179static struct usb_serial_driver cypress_earthmate_device = { 179static struct usb_serial_driver cypress_earthmate_device = {
180 .driver = { 180 .driver = {
181 .owner = THIS_MODULE, 181 .owner = THIS_MODULE,
182 .name = "earthmate",
182 }, 183 },
183 .name = "DeLorme Earthmate USB", 184 .description = "DeLorme Earthmate USB",
184 .short_name = "earthmate",
185 .id_table = id_table_earthmate, 185 .id_table = id_table_earthmate,
186 .num_interrupt_in = 1, 186 .num_interrupt_in = 1,
187 .num_interrupt_out = 1, 187 .num_interrupt_out = 1,
@@ -208,9 +208,9 @@ static struct usb_serial_driver cypress_earthmate_device = {
208static struct usb_serial_driver cypress_hidcom_device = { 208static struct usb_serial_driver cypress_hidcom_device = {
209 .driver = { 209 .driver = {
210 .owner = THIS_MODULE, 210 .owner = THIS_MODULE,
211 .name = "cyphidcom",
211 }, 212 },
212 .name = "HID->COM RS232 Adapter", 213 .description = "HID->COM RS232 Adapter",
213 .short_name = "cyphidcom",
214 .id_table = id_table_cyphidcomrs232, 214 .id_table = id_table_cyphidcomrs232,
215 .num_interrupt_in = 1, 215 .num_interrupt_in = 1,
216 .num_interrupt_out = 1, 216 .num_interrupt_out = 1,
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index be9b495d2491..dc74644a603d 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -505,10 +505,10 @@ static struct usb_driver digi_driver = {
505 505
506static struct usb_serial_driver digi_acceleport_2_device = { 506static struct usb_serial_driver digi_acceleport_2_device = {
507 .driver = { 507 .driver = {
508 .owner = THIS_MODULE, 508 .owner = THIS_MODULE,
509 .name = "digi_2",
509 }, 510 },
510 .name = "Digi 2 port USB adapter", 511 .description = "Digi 2 port USB adapter",
511 .short_name = "digi_2",
512 .id_table = id_table_2, 512 .id_table = id_table_2,
513 .num_interrupt_in = 0, 513 .num_interrupt_in = 0,
514 .num_bulk_in = 4, 514 .num_bulk_in = 4,
@@ -534,10 +534,10 @@ static struct usb_serial_driver digi_acceleport_2_device = {
534 534
535static struct usb_serial_driver digi_acceleport_4_device = { 535static struct usb_serial_driver digi_acceleport_4_device = {
536 .driver = { 536 .driver = {
537 .owner = THIS_MODULE, 537 .owner = THIS_MODULE,
538 .name = "digi_4",
538 }, 539 },
539 .name = "Digi 4 port USB adapter", 540 .description = "Digi 4 port USB adapter",
540 .short_name = "digi_4",
541 .id_table = id_table_4, 541 .id_table = id_table_4,
542 .num_interrupt_in = 0, 542 .num_interrupt_in = 0,
543 .num_bulk_in = 5, 543 .num_bulk_in = 5,
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 3e6c4ba7667b..0b0546dcc7b9 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -115,8 +115,8 @@ static struct usb_driver empeg_driver = {
115static struct usb_serial_driver empeg_device = { 115static struct usb_serial_driver empeg_device = {
116 .driver = { 116 .driver = {
117 .owner = THIS_MODULE, 117 .owner = THIS_MODULE,
118 .name = "empeg",
118 }, 119 },
119 .name = "Empeg",
120 .id_table = id_table, 120 .id_table = id_table,
121 .num_interrupt_in = 0, 121 .num_interrupt_in = 0,
122 .num_bulk_in = 1, 122 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 9d945de0acac..77d54ac39a0e 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -565,9 +565,9 @@ static __u32 ftdi_232bm_baud_to_divisor (int baud);
565static struct usb_serial_driver ftdi_sio_device = { 565static struct usb_serial_driver ftdi_sio_device = {
566 .driver = { 566 .driver = {
567 .owner = THIS_MODULE, 567 .owner = THIS_MODULE,
568 .name = "ftdi_sio",
568 }, 569 },
569 .name = "FTDI USB Serial Device", 570 .description = "FTDI USB Serial Device",
570 .short_name = "ftdi_sio",
571 .id_table = id_table_combined, 571 .id_table = id_table_combined,
572 .num_interrupt_in = 0, 572 .num_interrupt_in = 0,
573 .num_bulk_in = 1, 573 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 3fd98c00cd6a..35820bda7ae1 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1472,9 +1472,9 @@ static void garmin_shutdown (struct usb_serial *serial)
1472static struct usb_serial_driver garmin_device = { 1472static struct usb_serial_driver garmin_device = {
1473 .driver = { 1473 .driver = {
1474 .owner = THIS_MODULE, 1474 .owner = THIS_MODULE,
1475 .name = "garmin_gps",
1475 }, 1476 },
1476 .name = "Garmin GPS usb/tty", 1477 .description = "Garmin GPS usb/tty",
1477 .short_name = "garmin_gps",
1478 .id_table = id_table, 1478 .id_table = id_table,
1479 .num_interrupt_in = 1, 1479 .num_interrupt_in = 1,
1480 .num_bulk_in = 1, 1480 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 779bea0c6242..8909208f506a 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -39,9 +39,8 @@ static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
39struct usb_serial_driver usb_serial_generic_device = { 39struct usb_serial_driver usb_serial_generic_device = {
40 .driver = { 40 .driver = {
41 .owner = THIS_MODULE, 41 .owner = THIS_MODULE,
42 .name = "generic",
42 }, 43 },
43 .name = "Generic",
44 .short_name = "generic",
45 .id_table = generic_device_ids, 44 .id_table = generic_device_ids,
46 .num_interrupt_in = NUM_DONT_CARE, 45 .num_interrupt_in = NUM_DONT_CARE,
47 .num_bulk_in = NUM_DONT_CARE, 46 .num_bulk_in = NUM_DONT_CARE,
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index 4f3cbc08c4ee..8eadfb705601 100644
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -38,7 +38,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
38 38
39static struct usb_driver hp49gp_driver = { 39static struct usb_driver hp49gp_driver = {
40 .owner = THIS_MODULE, 40 .owner = THIS_MODULE,
41 .name = "HP4X", 41 .name = "hp4X",
42 .probe = usb_serial_probe, 42 .probe = usb_serial_probe,
43 .disconnect = usb_serial_disconnect, 43 .disconnect = usb_serial_disconnect,
44 .id_table = id_table, 44 .id_table = id_table,
@@ -47,8 +47,8 @@ static struct usb_driver hp49gp_driver = {
47static struct usb_serial_driver hp49gp_device = { 47static struct usb_serial_driver hp49gp_device = {
48 .driver = { 48 .driver = {
49 .owner = THIS_MODULE, 49 .owner = THIS_MODULE,
50 .name = "hp4X",
50 }, 51 },
51 .name = "HP4X",
52 .id_table = id_table, 52 .id_table = id_table,
53 .num_interrupt_in = NUM_DONT_CARE, 53 .num_interrupt_in = NUM_DONT_CARE,
54 .num_bulk_in = NUM_DONT_CARE, 54 .num_bulk_in = NUM_DONT_CARE,
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index 28fb0d42a166..fad561c04c76 100644
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -78,9 +78,9 @@ MODULE_DEVICE_TABLE (usb, id_table_combined);
78static struct usb_serial_driver edgeport_2port_device = { 78static struct usb_serial_driver edgeport_2port_device = {
79 .driver = { 79 .driver = {
80 .owner = THIS_MODULE, 80 .owner = THIS_MODULE,
81 .name = "edgeport_2",
81 }, 82 },
82 .name = "Edgeport 2 port adapter", 83 .description = "Edgeport 2 port adapter",
83 .short_name = "edgeport_2",
84 .id_table = edgeport_2port_id_table, 84 .id_table = edgeport_2port_id_table,
85 .num_interrupt_in = 1, 85 .num_interrupt_in = 1,
86 .num_bulk_in = 1, 86 .num_bulk_in = 1,
@@ -108,9 +108,9 @@ static struct usb_serial_driver edgeport_2port_device = {
108static struct usb_serial_driver edgeport_4port_device = { 108static struct usb_serial_driver edgeport_4port_device = {
109 .driver = { 109 .driver = {
110 .owner = THIS_MODULE, 110 .owner = THIS_MODULE,
111 .name = "edgeport_4",
111 }, 112 },
112 .name = "Edgeport 4 port adapter", 113 .description = "Edgeport 4 port adapter",
113 .short_name = "edgeport_4",
114 .id_table = edgeport_4port_id_table, 114 .id_table = edgeport_4port_id_table,
115 .num_interrupt_in = 1, 115 .num_interrupt_in = 1,
116 .num_bulk_in = 1, 116 .num_bulk_in = 1,
@@ -138,9 +138,9 @@ static struct usb_serial_driver edgeport_4port_device = {
138static struct usb_serial_driver edgeport_8port_device = { 138static struct usb_serial_driver edgeport_8port_device = {
139 .driver = { 139 .driver = {
140 .owner = THIS_MODULE, 140 .owner = THIS_MODULE,
141 .name = "edgeport_8",
141 }, 142 },
142 .name = "Edgeport 8 port adapter", 143 .description = "Edgeport 8 port adapter",
143 .short_name = "edgeport_8",
144 .id_table = edgeport_8port_id_table, 144 .id_table = edgeport_8port_id_table,
145 .num_interrupt_in = 1, 145 .num_interrupt_in = 1,
146 .num_bulk_in = 1, 146 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index 74228a072643..832b6d6734c0 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2984,10 +2984,10 @@ static unsigned int edge_buf_get(struct edge_buf *eb, char *buf,
2984 2984
2985static struct usb_serial_driver edgeport_1port_device = { 2985static struct usb_serial_driver edgeport_1port_device = {
2986 .driver = { 2986 .driver = {
2987 .owner = THIS_MODULE, 2987 .owner = THIS_MODULE,
2988 .name = "edgeport_ti_1",
2988 }, 2989 },
2989 .name = "Edgeport TI 1 port adapter", 2990 .description = "Edgeport TI 1 port adapter",
2990 .short_name = "edgeport_ti_1",
2991 .id_table = edgeport_1port_id_table, 2991 .id_table = edgeport_1port_id_table,
2992 .num_interrupt_in = 1, 2992 .num_interrupt_in = 1,
2993 .num_bulk_in = 1, 2993 .num_bulk_in = 1,
@@ -3014,10 +3014,10 @@ static struct usb_serial_driver edgeport_1port_device = {
3014 3014
3015static struct usb_serial_driver edgeport_2port_device = { 3015static struct usb_serial_driver edgeport_2port_device = {
3016 .driver = { 3016 .driver = {
3017 .owner = THIS_MODULE, 3017 .owner = THIS_MODULE,
3018 .name = "edgeport_ti_2",
3018 }, 3019 },
3019 .name = "Edgeport TI 2 port adapter", 3020 .description = "Edgeport TI 2 port adapter",
3020 .short_name = "edgeport_ti_2",
3021 .id_table = edgeport_2port_id_table, 3021 .id_table = edgeport_2port_id_table,
3022 .num_interrupt_in = 1, 3022 .num_interrupt_in = 1,
3023 .num_bulk_in = 2, 3023 .num_bulk_in = 2,
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index 9aedfb91b20c..1abaebe6dbc1 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -550,8 +550,9 @@ static struct usb_driver ipaq_driver = {
550static struct usb_serial_driver ipaq_device = { 550static struct usb_serial_driver ipaq_device = {
551 .driver = { 551 .driver = {
552 .owner = THIS_MODULE, 552 .owner = THIS_MODULE,
553 .name = "ipaq",
553 }, 554 },
554 .name = "PocketPC PDA", 555 .description = "PocketPC PDA",
555 .id_table = ipaq_id_table, 556 .id_table = ipaq_id_table,
556 .num_interrupt_in = NUM_DONT_CARE, 557 .num_interrupt_in = NUM_DONT_CARE,
557 .num_bulk_in = 1, 558 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 2ba69623ac05..a02fada85362 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -446,9 +446,9 @@ static int ipw_disconnect(struct usb_serial_port *port)
446static struct usb_serial_driver ipw_device = { 446static struct usb_serial_driver ipw_device = {
447 .driver = { 447 .driver = {
448 .owner = THIS_MODULE, 448 .owner = THIS_MODULE,
449 .name = "ipw",
449 }, 450 },
450 .name = "IPWireless converter", 451 .description = "IPWireless converter",
451 .short_name = "ipw",
452 .id_table = usb_ipw_ids, 452 .id_table = usb_ipw_ids,
453 .num_interrupt_in = NUM_DONT_CARE, 453 .num_interrupt_in = NUM_DONT_CARE,
454 .num_bulk_in = 1, 454 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index bf079059819e..19f329e9bdcf 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -136,8 +136,9 @@ static struct usb_driver ir_driver = {
136static struct usb_serial_driver ir_device = { 136static struct usb_serial_driver ir_device = {
137 .driver = { 137 .driver = {
138 .owner = THIS_MODULE, 138 .owner = THIS_MODULE,
139 .name = "ir-usb",
139 }, 140 },
140 .name = "IR Dongle", 141 .description = "IR Dongle",
141 .id_table = id_table, 142 .id_table = id_table,
142 .num_interrupt_in = 1, 143 .num_interrupt_in = 1,
143 .num_bulk_in = 1, 144 .num_bulk_in = 1,
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[] = {
573static struct usb_serial_driver keyspan_pre_device = { 573static struct usb_serial_driver keyspan_pre_device = {
574 .driver = { 574 .driver = {
575 .owner = THIS_MODULE, 575 .owner = THIS_MODULE,
576 .name = "keyspan_no_firm",
576 }, 577 },
577 .name = "Keyspan - (without firmware)", 578 .description = "Keyspan - (without firmware)",
578 .short_name = "keyspan_no_firm",
579 .id_table = keyspan_pre_ids, 579 .id_table = keyspan_pre_ids,
580 .num_interrupt_in = NUM_DONT_CARE, 580 .num_interrupt_in = NUM_DONT_CARE,
581 .num_bulk_in = NUM_DONT_CARE, 581 .num_bulk_in = NUM_DONT_CARE,
@@ -587,9 +587,9 @@ static struct usb_serial_driver keyspan_pre_device = {
587static struct usb_serial_driver keyspan_1port_device = { 587static struct usb_serial_driver keyspan_1port_device = {
588 .driver = { 588 .driver = {
589 .owner = THIS_MODULE, 589 .owner = THIS_MODULE,
590 .name = "keyspan_1",
590 }, 591 },
591 .name = "Keyspan 1 port adapter", 592 .description = "Keyspan 1 port adapter",
592 .short_name = "keyspan_1",
593 .id_table = keyspan_1port_ids, 593 .id_table = keyspan_1port_ids,
594 .num_interrupt_in = NUM_DONT_CARE, 594 .num_interrupt_in = NUM_DONT_CARE,
595 .num_bulk_in = NUM_DONT_CARE, 595 .num_bulk_in = NUM_DONT_CARE,
@@ -614,9 +614,9 @@ static struct usb_serial_driver keyspan_1port_device = {
614static struct usb_serial_driver keyspan_2port_device = { 614static struct usb_serial_driver keyspan_2port_device = {
615 .driver = { 615 .driver = {
616 .owner = THIS_MODULE, 616 .owner = THIS_MODULE,
617 .name = "keyspan_2",
617 }, 618 },
618 .name = "Keyspan 2 port adapter", 619 .description = "Keyspan 2 port adapter",
619 .short_name = "keyspan_2",
620 .id_table = keyspan_2port_ids, 620 .id_table = keyspan_2port_ids,
621 .num_interrupt_in = NUM_DONT_CARE, 621 .num_interrupt_in = NUM_DONT_CARE,
622 .num_bulk_in = NUM_DONT_CARE, 622 .num_bulk_in = NUM_DONT_CARE,
@@ -641,9 +641,9 @@ static struct usb_serial_driver keyspan_2port_device = {
641static struct usb_serial_driver keyspan_4port_device = { 641static struct usb_serial_driver keyspan_4port_device = {
642 .driver = { 642 .driver = {
643 .owner = THIS_MODULE, 643 .owner = THIS_MODULE,
644 .name = "keyspan_4",
644 }, 645 },
645 .name = "Keyspan 4 port adapter", 646 .description = "Keyspan 4 port adapter",
646 .short_name = "keyspan_4",
647 .id_table = keyspan_4port_ids, 647 .id_table = keyspan_4port_ids,
648 .num_interrupt_in = NUM_DONT_CARE, 648 .num_interrupt_in = NUM_DONT_CARE,
649 .num_bulk_in = 5, 649 .num_bulk_in = 5,
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 389b7833e3ae..cd4f48bd83b6 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -786,9 +786,9 @@ static void keyspan_pda_shutdown (struct usb_serial *serial)
786static struct usb_serial_driver keyspan_pda_fake_device = { 786static struct usb_serial_driver keyspan_pda_fake_device = {
787 .driver = { 787 .driver = {
788 .owner = THIS_MODULE, 788 .owner = THIS_MODULE,
789 .name = "keyspan_pda_pre",
789 }, 790 },
790 .name = "Keyspan PDA - (prerenumeration)", 791 .description = "Keyspan PDA - (prerenumeration)",
791 .short_name = "keyspan_pda_pre",
792 .id_table = id_table_fake, 792 .id_table = id_table_fake,
793 .num_interrupt_in = NUM_DONT_CARE, 793 .num_interrupt_in = NUM_DONT_CARE,
794 .num_bulk_in = NUM_DONT_CARE, 794 .num_bulk_in = NUM_DONT_CARE,
@@ -802,9 +802,9 @@ static struct usb_serial_driver keyspan_pda_fake_device = {
802static struct usb_serial_driver xircom_pgs_fake_device = { 802static struct usb_serial_driver xircom_pgs_fake_device = {
803 .driver = { 803 .driver = {
804 .owner = THIS_MODULE, 804 .owner = THIS_MODULE,
805 .name = "xircom_no_firm",
805 }, 806 },
806 .name = "Xircom / Entregra PGS - (prerenumeration)", 807 .description = "Xircom / Entregra PGS - (prerenumeration)",
807 .short_name = "xircom_no_firm",
808 .id_table = id_table_fake_xircom, 808 .id_table = id_table_fake_xircom,
809 .num_interrupt_in = NUM_DONT_CARE, 809 .num_interrupt_in = NUM_DONT_CARE,
810 .num_bulk_in = NUM_DONT_CARE, 810 .num_bulk_in = NUM_DONT_CARE,
@@ -817,9 +817,9 @@ static struct usb_serial_driver xircom_pgs_fake_device = {
817static struct usb_serial_driver keyspan_pda_device = { 817static struct usb_serial_driver keyspan_pda_device = {
818 .driver = { 818 .driver = {
819 .owner = THIS_MODULE, 819 .owner = THIS_MODULE,
820 .name = "keyspan_pda",
820 }, 821 },
821 .name = "Keyspan PDA", 822 .description = "Keyspan PDA",
822 .short_name = "keyspan_pda",
823 .id_table = id_table_std, 823 .id_table = id_table_std,
824 .num_interrupt_in = 1, 824 .num_interrupt_in = 1,
825 .num_bulk_in = 0, 825 .num_bulk_in = 0,
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 586108ce7897..a8951c0fd020 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -126,9 +126,9 @@ static struct usb_driver kl5kusb105d_driver = {
126static struct usb_serial_driver kl5kusb105d_device = { 126static struct usb_serial_driver kl5kusb105d_device = {
127 .driver = { 127 .driver = {
128 .owner = THIS_MODULE, 128 .owner = THIS_MODULE,
129 .name = "kl5kusb105d",
129 }, 130 },
130 .name = "KL5KUSB105D / PalmConnect", 131 .description = "KL5KUSB105D / PalmConnect",
131 .short_name = "kl5kusb105d",
132 .id_table = id_table, 132 .id_table = id_table,
133 .num_interrupt_in = 1, 133 .num_interrupt_in = 1,
134 .num_bulk_in = 1, 134 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index a9578e05b22f..9456dd9dd136 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -108,8 +108,9 @@ static struct usb_driver kobil_driver = {
108static struct usb_serial_driver kobil_device = { 108static struct usb_serial_driver kobil_device = {
109 .driver = { 109 .driver = {
110 .owner = THIS_MODULE, 110 .owner = THIS_MODULE,
111 .name = "kobil",
111 }, 112 },
112 .name = "KOBIL USB smart card terminal", 113 .description = "KOBIL USB smart card terminal",
113 .id_table = id_table, 114 .id_table = id_table,
114 .num_interrupt_in = NUM_DONT_CARE, 115 .num_interrupt_in = NUM_DONT_CARE,
115 .num_bulk_in = 0, 116 .num_bulk_in = 0,
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 7dcf91c5f83d..ca5dbadb9b7e 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -135,9 +135,9 @@ static struct usb_driver mct_u232_driver = {
135static struct usb_serial_driver mct_u232_device = { 135static struct usb_serial_driver mct_u232_device = {
136 .driver = { 136 .driver = {
137 .owner = THIS_MODULE, 137 .owner = THIS_MODULE,
138 .name = "mct_u232",
138 }, 139 },
139 .name = "MCT U232", 140 .description = "MCT U232",
140 .short_name = "mct_u232",
141 .id_table = id_table_combined, 141 .id_table = id_table_combined,
142 .num_interrupt_in = 2, 142 .num_interrupt_in = 2,
143 .num_bulk_in = 0, 143 .num_bulk_in = 0,
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index f6327cc1b2e7..3caf97072ac0 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -91,9 +91,9 @@ static struct usb_driver omninet_driver = {
91static struct usb_serial_driver zyxel_omninet_device = { 91static struct usb_serial_driver zyxel_omninet_device = {
92 .driver = { 92 .driver = {
93 .owner = THIS_MODULE, 93 .owner = THIS_MODULE,
94 .name = "omninet",
94 }, 95 },
95 .name = "ZyXEL - omni.net lcd plus usb", 96 .description = "ZyXEL - omni.net lcd plus usb",
96 .short_name = "omninet",
97 .id_table = id_table, 97 .id_table = id_table,
98 .num_interrupt_in = 1, 98 .num_interrupt_in = 1,
99 .num_bulk_in = 1, 99 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index a2b5adf34868..7716000045b7 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -108,9 +108,9 @@ static struct usb_driver option_driver = {
108static struct usb_serial_driver option_3port_device = { 108static struct usb_serial_driver option_3port_device = {
109 .driver = { 109 .driver = {
110 .owner = THIS_MODULE, 110 .owner = THIS_MODULE,
111 .name = "option",
111 }, 112 },
112 .name = "Option 3G data card", 113 .description = "Option 3G data card",
113 .short_name = "option",
114 .id_table = option_ids, 114 .id_table = option_ids,
115 .num_interrupt_in = NUM_DONT_CARE, 115 .num_interrupt_in = NUM_DONT_CARE,
116 .num_bulk_in = NUM_DONT_CARE, 116 .num_bulk_in = NUM_DONT_CARE,
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 29719ceab19a..f8f4e93e8c0b 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -157,8 +157,8 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
157static struct usb_serial_driver pl2303_device = { 157static struct usb_serial_driver pl2303_device = {
158 .driver = { 158 .driver = {
159 .owner = THIS_MODULE, 159 .owner = THIS_MODULE,
160 .name = "pl2303",
160 }, 161 },
161 .name = "PL-2303",
162 .id_table = id_table, 162 .id_table = id_table,
163 .num_interrupt_in = NUM_DONT_CARE, 163 .num_interrupt_in = NUM_DONT_CARE,
164 .num_bulk_in = 1, 164 .num_bulk_in = 1,
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 42a86ab689f4..c22bdc0c4dfd 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -400,8 +400,8 @@ static int safe_startup (struct usb_serial *serial)
400static struct usb_serial_driver safe_device = { 400static struct usb_serial_driver safe_device = {
401 .driver = { 401 .driver = {
402 .owner = THIS_MODULE, 402 .owner = THIS_MODULE,
403 .name = "safe_serial",
403 }, 404 },
404 .name = "Safe",
405 .id_table = id_table, 405 .id_table = id_table,
406 .num_interrupt_in = NUM_DONT_CARE, 406 .num_interrupt_in = NUM_DONT_CARE,
407 .num_bulk_in = NUM_DONT_CARE, 407 .num_bulk_in = NUM_DONT_CARE,
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index eab8a6de0925..205dbf7201da 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -257,9 +257,10 @@ static struct usb_driver ti_usb_driver = {
257 257
258static struct usb_serial_driver ti_1port_device = { 258static struct usb_serial_driver ti_1port_device = {
259 .driver = { 259 .driver = {
260 .owner = THIS_MODULE, 260 .owner = THIS_MODULE,
261 .name = "ti_usb_3410_5052_1",
261 }, 262 },
262 .name = "TI USB 3410 1 port adapter", 263 .description = "TI USB 3410 1 port adapter",
263 .id_table = ti_id_table_3410, 264 .id_table = ti_id_table_3410,
264 .num_interrupt_in = 1, 265 .num_interrupt_in = 1,
265 .num_bulk_in = 1, 266 .num_bulk_in = 1,
@@ -286,9 +287,10 @@ static struct usb_serial_driver ti_1port_device = {
286 287
287static struct usb_serial_driver ti_2port_device = { 288static struct usb_serial_driver ti_2port_device = {
288 .driver = { 289 .driver = {
289 .owner = THIS_MODULE, 290 .owner = THIS_MODULE,
291 .name = "ti_usb_3410_5052_2",
290 }, 292 },
291 .name = "TI USB 5052 2 port adapter", 293 .description = "TI USB 5052 2 port adapter",
292 .id_table = ti_id_table_5052, 294 .id_table = ti_id_table_5052,
293 .num_interrupt_in = 1, 295 .num_interrupt_in = 1,
294 .num_bulk_in = 2, 296 .num_bulk_in = 2,
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index fde09fba8790..13f6592be685 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -122,7 +122,7 @@ static void destroy_serial(struct kref *kref)
122 122
123 serial = to_usb_serial(kref); 123 serial = to_usb_serial(kref);
124 124
125 dbg ("%s - %s", __FUNCTION__, serial->type->name); 125 dbg("%s - %s", __FUNCTION__, serial->type->description);
126 126
127 serial->type->shutdown(serial); 127 serial->type->shutdown(serial);
128 128
@@ -415,7 +415,7 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
415 length += sprintf (page+length, "%d:", i); 415 length += sprintf (page+length, "%d:", i);
416 if (serial->type->driver.owner) 416 if (serial->type->driver.owner)
417 length += sprintf (page+length, " module:%s", module_name(serial->type->driver.owner)); 417 length += sprintf (page+length, " module:%s", module_name(serial->type->driver.owner));
418 length += sprintf (page+length, " name:\"%s\"", serial->type->name); 418 length += sprintf (page+length, " name:\"%s\"", serial->type->description);
419 length += sprintf (page+length, " vendor:%04x product:%04x", 419 length += sprintf (page+length, " vendor:%04x product:%04x",
420 le16_to_cpu(serial->dev->descriptor.idVendor), 420 le16_to_cpu(serial->dev->descriptor.idVendor),
421 le16_to_cpu(serial->dev->descriptor.idProduct)); 421 le16_to_cpu(serial->dev->descriptor.idProduct));
@@ -687,7 +687,7 @@ int usb_serial_probe(struct usb_interface *interface,
687#endif 687#endif
688 688
689 /* found all that we need */ 689 /* found all that we need */
690 dev_info(&interface->dev, "%s converter detected\n", type->name); 690 dev_info(&interface->dev, "%s converter detected\n", type->description);
691 691
692#ifdef CONFIG_USB_SERIAL_GENERIC 692#ifdef CONFIG_USB_SERIAL_GENERIC
693 if (type == &usb_serial_generic_device) { 693 if (type == &usb_serial_generic_device) {
@@ -1088,16 +1088,19 @@ int usb_serial_register(struct usb_serial_driver *driver)
1088 1088
1089 fixup_generic(driver); 1089 fixup_generic(driver);
1090 1090
1091 if (!driver->description)
1092 driver->description = driver->driver.name;
1093
1091 /* Add this device to our list of devices */ 1094 /* Add this device to our list of devices */
1092 list_add(&driver->driver_list, &usb_serial_driver_list); 1095 list_add(&driver->driver_list, &usb_serial_driver_list);
1093 1096
1094 retval = usb_serial_bus_register(driver); 1097 retval = usb_serial_bus_register(driver);
1095 if (retval) { 1098 if (retval) {
1096 err("problem %d when registering driver %s", retval, driver->name); 1099 err("problem %d when registering driver %s", retval, driver->description);
1097 list_del(&driver->driver_list); 1100 list_del(&driver->driver_list);
1098 } 1101 }
1099 else 1102 else
1100 info("USB Serial support registered for %s", driver->name); 1103 info("USB Serial support registered for %s", driver->description);
1101 1104
1102 return retval; 1105 return retval;
1103} 1106}
@@ -1105,7 +1108,7 @@ int usb_serial_register(struct usb_serial_driver *driver)
1105 1108
1106void usb_serial_deregister(struct usb_serial_driver *device) 1109void usb_serial_deregister(struct usb_serial_driver *device)
1107{ 1110{
1108 info("USB Serial deregistering driver %s", device->name); 1111 info("USB Serial deregistering driver %s", device->description);
1109 list_del(&device->driver_list); 1112 list_del(&device->driver_list);
1110 usb_serial_bus_deregister(device); 1113 usb_serial_bus_deregister(device);
1111} 1114}
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
index 1cedc1999508..238a5a871ed6 100644
--- a/drivers/usb/serial/usb-serial.h
+++ b/drivers/usb/serial/usb-serial.h
@@ -149,11 +149,8 @@ static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
149 149
150/** 150/**
151 * usb_serial_driver - describes a usb serial driver 151 * usb_serial_driver - describes a usb serial driver
152 * @name: pointer to a string that describes this driver. This string used 152 * @description: pointer to a string that describes this driver. This string used
153 * in the syslog messages when a device is inserted or removed. 153 * in the syslog messages when a device is inserted or removed.
154 * @short_name: a pointer to a string that describes this driver in
155 * KOBJ_NAME_LEN characters or less. This is used for the sysfs interface
156 * to describe the driver.
157 * @id_table: pointer to a list of usb_device_id structures that define all 154 * @id_table: pointer to a list of usb_device_id structures that define all
158 * of the devices this structure can support. 155 * of the devices this structure can support.
159 * @num_interrupt_in: the number of interrupt in endpoints this device will 156 * @num_interrupt_in: the number of interrupt in endpoints this device will
@@ -187,11 +184,12 @@ static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
187 * called, the generic serial function will be used instead. 184 * called, the generic serial function will be used instead.
188 * 185 *
189 * The driver.owner field should be set to the module owner of this driver. 186 * The driver.owner field should be set to the module owner of this driver.
190 * 187 * The driver.name field should be set to the name of this driver (remember
188 * it will show up in sysfs, so it needs to be short and to the point.
189 * Useing the module name is a good idea.)
191 */ 190 */
192struct usb_serial_driver { 191struct usb_serial_driver {
193 char *name; 192 const char *description;
194 char *short_name;
195 const struct usb_device_id *id_table; 193 const struct usb_device_id *id_table;
196 char num_interrupt_in; 194 char num_interrupt_in;
197 char num_interrupt_out; 195 char num_interrupt_out;
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 39ad0cab8635..baa2acb28bd8 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -185,9 +185,9 @@ static struct usb_driver visor_driver = {
185static struct usb_serial_driver handspring_device = { 185static struct usb_serial_driver handspring_device = {
186 .driver = { 186 .driver = {
187 .owner = THIS_MODULE, 187 .owner = THIS_MODULE,
188 .name = "visor",
188 }, 189 },
189 .name = "Handspring Visor / Palm OS", 190 .description = "Handspring Visor / Palm OS",
190 .short_name = "visor",
191 .id_table = id_table, 191 .id_table = id_table,
192 .num_interrupt_in = NUM_DONT_CARE, 192 .num_interrupt_in = NUM_DONT_CARE,
193 .num_bulk_in = 2, 193 .num_bulk_in = 2,
@@ -215,9 +215,9 @@ static struct usb_serial_driver handspring_device = {
215static struct usb_serial_driver clie_5_device = { 215static struct usb_serial_driver clie_5_device = {
216 .driver = { 216 .driver = {
217 .owner = THIS_MODULE, 217 .owner = THIS_MODULE,
218 .name = "clie_5",
218 }, 219 },
219 .name = "Sony Clie 5.0", 220 .description = "Sony Clie 5.0",
220 .short_name = "clie_5",
221 .id_table = clie_id_5_table, 221 .id_table = clie_id_5_table,
222 .num_interrupt_in = NUM_DONT_CARE, 222 .num_interrupt_in = NUM_DONT_CARE,
223 .num_bulk_in = 2, 223 .num_bulk_in = 2,
@@ -245,9 +245,9 @@ static struct usb_serial_driver clie_5_device = {
245static struct usb_serial_driver clie_3_5_device = { 245static struct usb_serial_driver clie_3_5_device = {
246 .driver = { 246 .driver = {
247 .owner = THIS_MODULE, 247 .owner = THIS_MODULE,
248 .name = "clie_3.5",
248 }, 249 },
249 .name = "Sony Clie 3.5", 250 .description = "Sony Clie 3.5",
250 .short_name = "clie_3.5",
251 .id_table = clie_id_3_5_table, 251 .id_table = clie_id_3_5_table,
252 .num_interrupt_in = 0, 252 .num_interrupt_in = 0,
253 .num_bulk_in = 1, 253 .num_bulk_in = 1,
@@ -659,7 +659,7 @@ static int palm_os_3_probe (struct usb_serial *serial, const struct usb_device_i
659 break; 659 break;
660 } 660 }
661 dev_info(dev, "%s: port %d, is for %s use\n", 661 dev_info(dev, "%s: port %d, is for %s use\n",
662 serial->type->name, 662 serial->type->description,
663 connection_info->connections[i].port, string); 663 connection_info->connections[i].port, string);
664 } 664 }
665 } 665 }
@@ -668,11 +668,11 @@ static int palm_os_3_probe (struct usb_serial *serial, const struct usb_device_i
668 */ 668 */
669 if (num_ports == 0 || num_ports > 2) { 669 if (num_ports == 0 || num_ports > 2) {
670 dev_warn (dev, "%s: No valid connect info available\n", 670 dev_warn (dev, "%s: No valid connect info available\n",
671 serial->type->name); 671 serial->type->description);
672 num_ports = 2; 672 num_ports = 2;
673 } 673 }
674 674
675 dev_info(dev, "%s: Number of ports: %d\n", serial->type->name, 675 dev_info(dev, "%s: Number of ports: %d\n", serial->type->description,
676 num_ports); 676 num_ports);
677 677
678 /* 678 /*
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index fb95a34a1cf7..18c3183be769 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -159,9 +159,9 @@ static void whiteheat_write_callback (struct urb *urb, struct pt_regs *regs);
159static struct usb_serial_driver whiteheat_fake_device = { 159static struct usb_serial_driver whiteheat_fake_device = {
160 .driver = { 160 .driver = {
161 .owner = THIS_MODULE, 161 .owner = THIS_MODULE,
162 .name = "whiteheatnofirm",
162 }, 163 },
163 .name = "Connect Tech - WhiteHEAT - (prerenumeration)", 164 .description = "Connect Tech - WhiteHEAT - (prerenumeration)",
164 .short_name = "whiteheatnofirm",
165 .id_table = id_table_prerenumeration, 165 .id_table = id_table_prerenumeration,
166 .num_interrupt_in = NUM_DONT_CARE, 166 .num_interrupt_in = NUM_DONT_CARE,
167 .num_bulk_in = NUM_DONT_CARE, 167 .num_bulk_in = NUM_DONT_CARE,
@@ -174,9 +174,9 @@ static struct usb_serial_driver whiteheat_fake_device = {
174static struct usb_serial_driver whiteheat_device = { 174static struct usb_serial_driver whiteheat_device = {
175 .driver = { 175 .driver = {
176 .owner = THIS_MODULE, 176 .owner = THIS_MODULE,
177 .name = "whiteheat",
177 }, 178 },
178 .name = "Connect Tech - WhiteHEAT", 179 .description = "Connect Tech - WhiteHEAT",
179 .short_name = "whiteheat",
180 .id_table = id_table_std, 180 .id_table = id_table_std,
181 .num_interrupt_in = NUM_DONT_CARE, 181 .num_interrupt_in = NUM_DONT_CARE,
182 .num_bulk_in = NUM_DONT_CARE, 182 .num_bulk_in = NUM_DONT_CARE,
@@ -386,10 +386,10 @@ static int whiteheat_attach (struct usb_serial *serial)
386 usb_clear_halt(serial->dev, pipe); 386 usb_clear_halt(serial->dev, pipe);
387 ret = usb_bulk_msg (serial->dev, pipe, command, 2, &alen, COMMAND_TIMEOUT_MS); 387 ret = usb_bulk_msg (serial->dev, pipe, command, 2, &alen, COMMAND_TIMEOUT_MS);
388 if (ret) { 388 if (ret) {
389 err("%s: Couldn't send command [%d]", serial->type->name, ret); 389 err("%s: Couldn't send command [%d]", serial->type->description, ret);
390 goto no_firmware; 390 goto no_firmware;
391 } else if (alen != sizeof(command)) { 391 } else if (alen != sizeof(command)) {
392 err("%s: Send command incomplete [%d]", serial->type->name, alen); 392 err("%s: Send command incomplete [%d]", serial->type->description, alen);
393 goto no_firmware; 393 goto no_firmware;
394 } 394 }
395 395
@@ -398,19 +398,19 @@ static int whiteheat_attach (struct usb_serial *serial)
398 usb_clear_halt(serial->dev, pipe); 398 usb_clear_halt(serial->dev, pipe);
399 ret = usb_bulk_msg (serial->dev, pipe, result, sizeof(*hw_info) + 1, &alen, COMMAND_TIMEOUT_MS); 399 ret = usb_bulk_msg (serial->dev, pipe, result, sizeof(*hw_info) + 1, &alen, COMMAND_TIMEOUT_MS);
400 if (ret) { 400 if (ret) {
401 err("%s: Couldn't get results [%d]", serial->type->name, ret); 401 err("%s: Couldn't get results [%d]", serial->type->description, ret);
402 goto no_firmware; 402 goto no_firmware;
403 } else if (alen != sizeof(result)) { 403 } else if (alen != sizeof(result)) {
404 err("%s: Get results incomplete [%d]", serial->type->name, alen); 404 err("%s: Get results incomplete [%d]", serial->type->description, alen);
405 goto no_firmware; 405 goto no_firmware;
406 } else if (result[0] != command[0]) { 406 } else if (result[0] != command[0]) {
407 err("%s: Command failed [%d]", serial->type->name, result[0]); 407 err("%s: Command failed [%d]", serial->type->description, result[0]);
408 goto no_firmware; 408 goto no_firmware;
409 } 409 }
410 410
411 hw_info = (struct whiteheat_hw_info *)&result[1]; 411 hw_info = (struct whiteheat_hw_info *)&result[1];
412 412
413 info("%s: Driver %s: Firmware v%d.%02d", serial->type->name, 413 info("%s: Driver %s: Firmware v%d.%02d", serial->type->description,
414 DRIVER_VERSION, hw_info->sw_major_rev, hw_info->sw_minor_rev); 414 DRIVER_VERSION, hw_info->sw_major_rev, hw_info->sw_minor_rev);
415 415
416 for (i = 0; i < serial->num_ports; i++) { 416 for (i = 0; i < serial->num_ports; i++) {
@@ -418,7 +418,7 @@ static int whiteheat_attach (struct usb_serial *serial)
418 418
419 info = (struct whiteheat_private *)kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL); 419 info = (struct whiteheat_private *)kmalloc(sizeof(struct whiteheat_private), GFP_KERNEL);
420 if (info == NULL) { 420 if (info == NULL) {
421 err("%s: Out of memory for port structures\n", serial->type->name); 421 err("%s: Out of memory for port structures\n", serial->type->description);
422 goto no_private; 422 goto no_private;
423 } 423 }
424 424
@@ -488,7 +488,7 @@ static int whiteheat_attach (struct usb_serial *serial)
488 488
489 command_info = (struct whiteheat_command_private *)kmalloc(sizeof(struct whiteheat_command_private), GFP_KERNEL); 489 command_info = (struct whiteheat_command_private *)kmalloc(sizeof(struct whiteheat_command_private), GFP_KERNEL);
490 if (command_info == NULL) { 490 if (command_info == NULL) {
491 err("%s: Out of memory for port structures\n", serial->type->name); 491 err("%s: Out of memory for port structures\n", serial->type->description);
492 goto no_command_private; 492 goto no_command_private;
493 } 493 }
494 494
@@ -505,9 +505,9 @@ static int whiteheat_attach (struct usb_serial *serial)
505 505
506no_firmware: 506no_firmware:
507 /* Firmware likely not running */ 507 /* Firmware likely not running */
508 err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->name); 508 err("%s: Unable to retrieve firmware version, try replugging\n", serial->type->description);
509 err("%s: If the firmware is not running (status led not blinking)\n", serial->type->name); 509 err("%s: If the firmware is not running (status led not blinking)\n", serial->type->description);
510 err("%s: please contact support@connecttech.com\n", serial->type->name); 510 err("%s: please contact support@connecttech.com\n", serial->type->description);
511 return -ENODEV; 511 return -ENODEV;
512 512
513no_command_private: 513no_command_private: