aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/airprime.c2
-rw-r--r--drivers/usb/serial/belkin_sa.c2
-rw-r--r--drivers/usb/serial/bus.c28
-rw-r--r--drivers/usb/serial/cp2101.c2
-rw-r--r--drivers/usb/serial/cyberjack.c2
-rw-r--r--drivers/usb/serial/cypress_m8.c4
-rw-r--r--drivers/usb/serial/digi_acceleport.c4
-rw-r--r--drivers/usb/serial/empeg.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/garmin_gps.c7
-rw-r--r--drivers/usb/serial/generic.c2
-rw-r--r--drivers/usb/serial/hp4x.c2
-rw-r--r--drivers/usb/serial/io_tables.h6
-rw-r--r--drivers/usb/serial/io_ti.c4
-rw-r--r--drivers/usb/serial/ipaq.c2
-rw-r--r--drivers/usb/serial/ipw.c2
-rw-r--r--drivers/usb/serial/ir-usb.c2
-rw-r--r--drivers/usb/serial/keyspan.h8
-rw-r--r--drivers/usb/serial/keyspan_pda.c6
-rw-r--r--drivers/usb/serial/kl5kusb105.c2
-rw-r--r--drivers/usb/serial/kobil_sct.c2
-rw-r--r--drivers/usb/serial/mct_u232.c2
-rw-r--r--drivers/usb/serial/omninet.c2
-rw-r--r--drivers/usb/serial/option.c2
-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.c4
-rw-r--r--drivers/usb/serial/usb-serial.c30
-rw-r--r--drivers/usb/serial/usb-serial.h28
-rw-r--r--drivers/usb/serial/visor.c6
-rw-r--r--drivers/usb/serial/whiteheat.c4
31 files changed, 85 insertions, 90 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 926d4c2c1600..104c04385bb9 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -30,7 +30,7 @@ static struct usb_driver airprime_driver = {
30 .id_table = id_table, 30 .id_table = id_table,
31}; 31};
32 32
33static struct usb_serial_device_type airprime_device = { 33static struct usb_serial_driver airprime_device = {
34 .owner = THIS_MODULE, 34 .owner = THIS_MODULE,
35 .name = "airprime", 35 .name = "airprime",
36 .id_table = id_table, 36 .id_table = id_table,
diff --git a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
index abb1b2c543bb..6d84de40cb7b 100644
--- a/drivers/usb/serial/belkin_sa.c
+++ b/drivers/usb/serial/belkin_sa.c
@@ -121,7 +121,7 @@ static struct usb_driver belkin_driver = {
121}; 121};
122 122
123/* All of the device info needed for the serial converters */ 123/* All of the device info needed for the serial converters */
124static struct usb_serial_device_type belkin_device = { 124static struct usb_serial_driver belkin_device = {
125 .owner = THIS_MODULE, 125 .owner = THIS_MODULE,
126 .name = "Belkin / Peracom / GoHubs USB Serial Adapter", 126 .name = "Belkin / Peracom / GoHubs USB Serial Adapter",
127 .short_name = "belkin", 127 .short_name = "belkin",
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 2f612c2d894b..5a0bcd34bb6d 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -18,7 +18,7 @@
18 18
19static int usb_serial_device_match (struct device *dev, struct device_driver *drv) 19static int usb_serial_device_match (struct device *dev, struct device_driver *drv)
20{ 20{
21 struct usb_serial_device_type *driver; 21 struct usb_serial_driver *driver;
22 const struct usb_serial_port *port; 22 const struct usb_serial_port *port;
23 23
24 /* 24 /*
@@ -44,7 +44,7 @@ struct bus_type usb_serial_bus_type = {
44 44
45static int usb_serial_device_probe (struct device *dev) 45static int usb_serial_device_probe (struct device *dev)
46{ 46{
47 struct usb_serial_device_type *driver; 47 struct usb_serial_driver *driver;
48 struct usb_serial_port *port; 48 struct usb_serial_port *port;
49 int retval = 0; 49 int retval = 0;
50 int minor; 50 int minor;
@@ -80,7 +80,7 @@ exit:
80 80
81static int usb_serial_device_remove (struct device *dev) 81static int usb_serial_device_remove (struct device *dev)
82{ 82{
83 struct usb_serial_device_type *driver; 83 struct usb_serial_driver *driver;
84 struct usb_serial_port *port; 84 struct usb_serial_port *port;
85 int retval = 0; 85 int retval = 0;
86 int minor; 86 int minor;
@@ -109,26 +109,26 @@ exit:
109 return retval; 109 return retval;
110} 110}
111 111
112int usb_serial_bus_register(struct usb_serial_device_type *device) 112int usb_serial_bus_register(struct usb_serial_driver *driver)
113{ 113{
114 int retval; 114 int retval;
115 115
116 if (device->short_name) 116 if (driver->short_name)
117 device->driver.name = (char *)device->short_name; 117 driver->driver.name = (char *)driver->short_name;
118 else 118 else
119 device->driver.name = (char *)device->name; 119 driver->driver.name = (char *)driver->name;
120 device->driver.bus = &usb_serial_bus_type; 120 driver->driver.bus = &usb_serial_bus_type;
121 device->driver.probe = usb_serial_device_probe; 121 driver->driver.probe = usb_serial_device_probe;
122 device->driver.remove = usb_serial_device_remove; 122 driver->driver.remove = usb_serial_device_remove;
123 device->driver.owner = device->owner; 123 driver->driver.owner = driver->owner;
124 124
125 retval = driver_register(&device->driver); 125 retval = driver_register(&driver->driver);
126 126
127 return retval; 127 return retval;
128} 128}
129 129
130void usb_serial_bus_deregister(struct usb_serial_device_type *device) 130void usb_serial_bus_deregister(struct usb_serial_driver *driver)
131{ 131{
132 driver_unregister (&device->driver); 132 driver_unregister(&driver->driver);
133} 133}
134 134
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 97c78c21e8d1..0b45b58bef5f 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -73,7 +73,7 @@ static struct usb_driver cp2101_driver = {
73 .id_table = id_table, 73 .id_table = id_table,
74}; 74};
75 75
76static struct usb_serial_device_type cp2101_device = { 76static struct usb_serial_driver cp2101_device = {
77 .owner = THIS_MODULE, 77 .owner = THIS_MODULE,
78 .name = "CP2101", 78 .name = "CP2101",
79 .id_table = id_table, 79 .id_table = id_table,
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index b5b431067b08..9f421a3c47e8 100644
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -83,7 +83,7 @@ static struct usb_driver cyberjack_driver = {
83 .id_table = id_table, 83 .id_table = id_table,
84}; 84};
85 85
86static struct usb_serial_device_type cyberjack_device = { 86static struct usb_serial_driver cyberjack_device = {
87 .owner = THIS_MODULE, 87 .owner = THIS_MODULE,
88 .name = "Reiner SCT Cyberjack USB card reader", 88 .name = "Reiner SCT Cyberjack USB card reader",
89 .short_name = "cyberjack", 89 .short_name = "cyberjack",
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 9ee1aaff2fcd..4fb8e59d1527 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -176,7 +176,7 @@ static unsigned int cypress_buf_put(struct cypress_buf *cb, const char *buf, u
176static unsigned int cypress_buf_get(struct cypress_buf *cb, char *buf, unsigned int count); 176static unsigned int cypress_buf_get(struct cypress_buf *cb, char *buf, unsigned int count);
177 177
178 178
179static struct usb_serial_device_type cypress_earthmate_device = { 179static struct usb_serial_driver cypress_earthmate_device = {
180 .owner = THIS_MODULE, 180 .owner = THIS_MODULE,
181 .name = "DeLorme Earthmate USB", 181 .name = "DeLorme Earthmate USB",
182 .short_name = "earthmate", 182 .short_name = "earthmate",
@@ -203,7 +203,7 @@ static struct usb_serial_device_type cypress_earthmate_device = {
203 .write_int_callback = cypress_write_int_callback, 203 .write_int_callback = cypress_write_int_callback,
204}; 204};
205 205
206static struct usb_serial_device_type cypress_hidcom_device = { 206static struct usb_serial_driver cypress_hidcom_device = {
207 .owner = THIS_MODULE, 207 .owner = THIS_MODULE,
208 .name = "HID->COM RS232 Adapter", 208 .name = "HID->COM RS232 Adapter",
209 .short_name = "cyphidcom", 209 .short_name = "cyphidcom",
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index a19a47f6cf12..66feb88b4316 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -503,7 +503,7 @@ static struct usb_driver digi_driver = {
503 503
504/* device info needed for the Digi serial converter */ 504/* device info needed for the Digi serial converter */
505 505
506static struct usb_serial_device_type digi_acceleport_2_device = { 506static struct usb_serial_driver digi_acceleport_2_device = {
507 .owner = THIS_MODULE, 507 .owner = THIS_MODULE,
508 .name = "Digi 2 port USB adapter", 508 .name = "Digi 2 port USB adapter",
509 .short_name = "digi_2", 509 .short_name = "digi_2",
@@ -530,7 +530,7 @@ static struct usb_serial_device_type digi_acceleport_2_device = {
530 .shutdown = digi_shutdown, 530 .shutdown = digi_shutdown,
531}; 531};
532 532
533static struct usb_serial_device_type digi_acceleport_4_device = { 533static struct usb_serial_driver digi_acceleport_4_device = {
534 .owner = THIS_MODULE, 534 .owner = THIS_MODULE,
535 .name = "Digi 4 port USB adapter", 535 .name = "Digi 4 port USB adapter",
536 .short_name = "digi_4", 536 .short_name = "digi_4",
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
index 8d562ab454a8..cbea8b38b60e 100644
--- a/drivers/usb/serial/empeg.c
+++ b/drivers/usb/serial/empeg.c
@@ -112,7 +112,7 @@ static struct usb_driver empeg_driver = {
112 .id_table = id_table, 112 .id_table = id_table,
113}; 113};
114 114
115static struct usb_serial_device_type empeg_device = { 115static struct usb_serial_driver empeg_device = {
116 .owner = THIS_MODULE, 116 .owner = THIS_MODULE,
117 .name = "Empeg", 117 .name = "Empeg",
118 .id_table = id_table, 118 .id_table = id_table,
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index b713113c1650..529e1a7ccfa0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -562,7 +562,7 @@ static unsigned short int ftdi_232am_baud_to_divisor (int baud);
562static __u32 ftdi_232bm_baud_base_to_divisor (int baud, int base); 562static __u32 ftdi_232bm_baud_base_to_divisor (int baud, int base);
563static __u32 ftdi_232bm_baud_to_divisor (int baud); 563static __u32 ftdi_232bm_baud_to_divisor (int baud);
564 564
565static struct usb_serial_device_type ftdi_sio_device = { 565static struct usb_serial_driver ftdi_sio_device = {
566 .owner = THIS_MODULE, 566 .owner = THIS_MODULE,
567 .name = "FTDI USB Serial Device", 567 .name = "FTDI USB Serial Device",
568 .short_name = "ftdi_sio", 568 .short_name = "ftdi_sio",
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 2ef614d5c8f2..7361194f1d66 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1468,13 +1468,8 @@ static void garmin_shutdown (struct usb_serial *serial)
1468} 1468}
1469 1469
1470 1470
1471
1472
1473
1474
1475
1476/* All of the device info needed */ 1471/* All of the device info needed */
1477static struct usb_serial_device_type garmin_device = { 1472static struct usb_serial_driver garmin_device = {
1478 .owner = THIS_MODULE, 1473 .owner = THIS_MODULE,
1479 .name = "Garmin GPS usb/tty", 1474 .name = "Garmin GPS usb/tty",
1480 .short_name = "garmin_gps", 1475 .short_name = "garmin_gps",
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 5f7d3193d355..7f567bf96549 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -36,7 +36,7 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
36static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ 36static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
37 37
38/* All of the device info needed for the Generic Serial Converter */ 38/* All of the device info needed for the Generic Serial Converter */
39struct usb_serial_device_type usb_serial_generic_device = { 39struct usb_serial_driver usb_serial_generic_device = {
40 .owner = THIS_MODULE, 40 .owner = THIS_MODULE,
41 .name = "Generic", 41 .name = "Generic",
42 .short_name = "generic", 42 .short_name = "generic",
diff --git a/drivers/usb/serial/hp4x.c b/drivers/usb/serial/hp4x.c
index 64d55fbd206e..b49469907a87 100644
--- a/drivers/usb/serial/hp4x.c
+++ b/drivers/usb/serial/hp4x.c
@@ -44,7 +44,7 @@ static struct usb_driver hp49gp_driver = {
44 .id_table = id_table, 44 .id_table = id_table,
45}; 45};
46 46
47static struct usb_serial_device_type hp49gp_device = { 47static struct usb_serial_driver hp49gp_device = {
48 .owner = THIS_MODULE, 48 .owner = THIS_MODULE,
49 .name = "HP4X", 49 .name = "HP4X",
50 .id_table = id_table, 50 .id_table = id_table,
diff --git a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
index e7ffe02408bd..7314c04727fe 100644
--- a/drivers/usb/serial/io_tables.h
+++ b/drivers/usb/serial/io_tables.h
@@ -75,7 +75,7 @@ static struct usb_device_id id_table_combined [] = {
75 75
76MODULE_DEVICE_TABLE (usb, id_table_combined); 76MODULE_DEVICE_TABLE (usb, id_table_combined);
77 77
78static struct usb_serial_device_type edgeport_2port_device = { 78static struct usb_serial_driver edgeport_2port_device = {
79 .owner = THIS_MODULE, 79 .owner = THIS_MODULE,
80 .name = "Edgeport 2 port adapter", 80 .name = "Edgeport 2 port adapter",
81 .short_name = "edgeport_2", 81 .short_name = "edgeport_2",
@@ -103,7 +103,7 @@ static struct usb_serial_device_type edgeport_2port_device = {
103 .write_bulk_callback = edge_bulk_out_data_callback, 103 .write_bulk_callback = edge_bulk_out_data_callback,
104}; 104};
105 105
106static struct usb_serial_device_type edgeport_4port_device = { 106static struct usb_serial_driver edgeport_4port_device = {
107 .owner = THIS_MODULE, 107 .owner = THIS_MODULE,
108 .name = "Edgeport 4 port adapter", 108 .name = "Edgeport 4 port adapter",
109 .short_name = "edgeport_4", 109 .short_name = "edgeport_4",
@@ -131,7 +131,7 @@ static struct usb_serial_device_type edgeport_4port_device = {
131 .write_bulk_callback = edge_bulk_out_data_callback, 131 .write_bulk_callback = edge_bulk_out_data_callback,
132}; 132};
133 133
134static struct usb_serial_device_type edgeport_8port_device = { 134static struct usb_serial_driver edgeport_8port_device = {
135 .owner = THIS_MODULE, 135 .owner = THIS_MODULE,
136 .name = "Edgeport 8 port adapter", 136 .name = "Edgeport 8 port adapter",
137 .short_name = "edgeport_8", 137 .short_name = "edgeport_8",
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index ebf9967f7c86..4328cc702ef7 100644
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -2982,7 +2982,7 @@ static unsigned int edge_buf_get(struct edge_buf *eb, char *buf,
2982} 2982}
2983 2983
2984 2984
2985static struct usb_serial_device_type edgeport_1port_device = { 2985static struct usb_serial_driver edgeport_1port_device = {
2986 .owner = THIS_MODULE, 2986 .owner = THIS_MODULE,
2987 .name = "Edgeport TI 1 port adapter", 2987 .name = "Edgeport TI 1 port adapter",
2988 .short_name = "edgeport_ti_1", 2988 .short_name = "edgeport_ti_1",
@@ -3010,7 +3010,7 @@ static struct usb_serial_device_type edgeport_1port_device = {
3010 .write_bulk_callback = edge_bulk_out_callback, 3010 .write_bulk_callback = edge_bulk_out_callback,
3011}; 3011};
3012 3012
3013static struct usb_serial_device_type edgeport_2port_device = { 3013static struct usb_serial_driver edgeport_2port_device = {
3014 .owner = THIS_MODULE, 3014 .owner = THIS_MODULE,
3015 .name = "Edgeport TI 2 port adapter", 3015 .name = "Edgeport TI 2 port adapter",
3016 .short_name = "edgeport_ti_2", 3016 .short_name = "edgeport_ti_2",
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index c05c2a2a0f31..9a79ad8d7a5f 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -547,7 +547,7 @@ static struct usb_driver ipaq_driver = {
547 547
548 548
549/* All of the device info needed for the Compaq iPAQ */ 549/* All of the device info needed for the Compaq iPAQ */
550static struct usb_serial_device_type ipaq_device = { 550static struct usb_serial_driver ipaq_device = {
551 .owner = THIS_MODULE, 551 .owner = THIS_MODULE,
552 .name = "PocketPC PDA", 552 .name = "PocketPC PDA",
553 .id_table = ipaq_id_table, 553 .id_table = ipaq_id_table,
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 85e242459c27..04524d34de3b 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -443,7 +443,7 @@ static int ipw_disconnect(struct usb_serial_port *port)
443 return 0; 443 return 0;
444} 444}
445 445
446static struct usb_serial_device_type ipw_device = { 446static struct usb_serial_driver ipw_device = {
447 .owner = THIS_MODULE, 447 .owner = THIS_MODULE,
448 .name = "IPWireless converter", 448 .name = "IPWireless converter",
449 .short_name = "ipw", 449 .short_name = "ipw",
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
index 937b2fdd7171..ecfb2060ea0f 100644
--- a/drivers/usb/serial/ir-usb.c
+++ b/drivers/usb/serial/ir-usb.c
@@ -133,7 +133,7 @@ static struct usb_driver ir_driver = {
133}; 133};
134 134
135 135
136static struct usb_serial_device_type ir_device = { 136static struct usb_serial_driver ir_device = {
137 .owner = THIS_MODULE, 137 .owner = THIS_MODULE,
138 .name = "IR Dongle", 138 .name = "IR Dongle",
139 .id_table = id_table, 139 .id_table = id_table,
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index e9b45b768aca..97e7d9e53e39 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -570,7 +570,7 @@ static struct usb_device_id keyspan_4port_ids[] = {
570}; 570};
571 571
572/* Structs for the devices, pre and post renumeration. */ 572/* Structs for the devices, pre and post renumeration. */
573static struct usb_serial_device_type keyspan_pre_device = { 573static struct usb_serial_driver keyspan_pre_device = {
574 .owner = THIS_MODULE, 574 .owner = THIS_MODULE,
575 .name = "Keyspan - (without firmware)", 575 .name = "Keyspan - (without firmware)",
576 .short_name = "keyspan_no_firm", 576 .short_name = "keyspan_no_firm",
@@ -582,7 +582,7 @@ static struct usb_serial_device_type keyspan_pre_device = {
582 .attach = keyspan_fake_startup, 582 .attach = keyspan_fake_startup,
583}; 583};
584 584
585static struct usb_serial_device_type keyspan_1port_device = { 585static struct usb_serial_driver keyspan_1port_device = {
586 .owner = THIS_MODULE, 586 .owner = THIS_MODULE,
587 .name = "Keyspan 1 port adapter", 587 .name = "Keyspan 1 port adapter",
588 .short_name = "keyspan_1", 588 .short_name = "keyspan_1",
@@ -607,7 +607,7 @@ static struct usb_serial_device_type keyspan_1port_device = {
607 .shutdown = keyspan_shutdown, 607 .shutdown = keyspan_shutdown,
608}; 608};
609 609
610static struct usb_serial_device_type keyspan_2port_device = { 610static struct usb_serial_driver keyspan_2port_device = {
611 .owner = THIS_MODULE, 611 .owner = THIS_MODULE,
612 .name = "Keyspan 2 port adapter", 612 .name = "Keyspan 2 port adapter",
613 .short_name = "keyspan_2", 613 .short_name = "keyspan_2",
@@ -632,7 +632,7 @@ static struct usb_serial_device_type keyspan_2port_device = {
632 .shutdown = keyspan_shutdown, 632 .shutdown = keyspan_shutdown,
633}; 633};
634 634
635static struct usb_serial_device_type keyspan_4port_device = { 635static struct usb_serial_driver keyspan_4port_device = {
636 .owner = THIS_MODULE, 636 .owner = THIS_MODULE,
637 .name = "Keyspan 4 port adapter", 637 .name = "Keyspan 4 port adapter",
638 .short_name = "keyspan_4", 638 .short_name = "keyspan_4",
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index 635c384cb15a..8fad0e963dd3 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -783,7 +783,7 @@ static void keyspan_pda_shutdown (struct usb_serial *serial)
783} 783}
784 784
785#ifdef KEYSPAN 785#ifdef KEYSPAN
786static struct usb_serial_device_type keyspan_pda_fake_device = { 786static struct usb_serial_driver keyspan_pda_fake_device = {
787 .owner = THIS_MODULE, 787 .owner = THIS_MODULE,
788 .name = "Keyspan PDA - (prerenumeration)", 788 .name = "Keyspan PDA - (prerenumeration)",
789 .short_name = "keyspan_pda_pre", 789 .short_name = "keyspan_pda_pre",
@@ -797,7 +797,7 @@ static struct usb_serial_device_type keyspan_pda_fake_device = {
797#endif 797#endif
798 798
799#ifdef XIRCOM 799#ifdef XIRCOM
800static struct usb_serial_device_type xircom_pgs_fake_device = { 800static struct usb_serial_driver xircom_pgs_fake_device = {
801 .owner = THIS_MODULE, 801 .owner = THIS_MODULE,
802 .name = "Xircom / Entregra PGS - (prerenumeration)", 802 .name = "Xircom / Entregra PGS - (prerenumeration)",
803 .short_name = "xircom_no_firm", 803 .short_name = "xircom_no_firm",
@@ -810,7 +810,7 @@ static struct usb_serial_device_type xircom_pgs_fake_device = {
810}; 810};
811#endif 811#endif
812 812
813static struct usb_serial_device_type keyspan_pda_device = { 813static struct usb_serial_driver keyspan_pda_device = {
814 .owner = THIS_MODULE, 814 .owner = THIS_MODULE,
815 .name = "Keyspan PDA", 815 .name = "Keyspan PDA",
816 .short_name = "keyspan_pda", 816 .short_name = "keyspan_pda",
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index a11e829e38c8..be082706b952 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -123,7 +123,7 @@ static struct usb_driver kl5kusb105d_driver = {
123 .id_table = id_table, 123 .id_table = id_table,
124}; 124};
125 125
126static struct usb_serial_device_type kl5kusb105d_device = { 126static struct usb_serial_driver kl5kusb105d_device = {
127 .owner = THIS_MODULE, 127 .owner = THIS_MODULE,
128 .name = "KL5KUSB105D / PalmConnect", 128 .name = "KL5KUSB105D / PalmConnect",
129 .short_name = "kl5kusb105d", 129 .short_name = "kl5kusb105d",
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index fe4c98a75171..94944340bb8d 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -105,7 +105,7 @@ static struct usb_driver kobil_driver = {
105}; 105};
106 106
107 107
108static struct usb_serial_device_type kobil_device = { 108static struct usb_serial_driver kobil_device = {
109 .owner = THIS_MODULE, 109 .owner = THIS_MODULE,
110 .name = "KOBIL USB smart card terminal", 110 .name = "KOBIL USB smart card terminal",
111 .id_table = id_table, 111 .id_table = id_table,
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index 50b6369647d2..9470964316a7 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -132,7 +132,7 @@ static struct usb_driver mct_u232_driver = {
132 .id_table = id_table_combined, 132 .id_table = id_table_combined,
133}; 133};
134 134
135static struct usb_serial_device_type mct_u232_device = { 135static struct usb_serial_driver mct_u232_device = {
136 .owner = THIS_MODULE, 136 .owner = THIS_MODULE,
137 .name = "MCT U232", 137 .name = "MCT U232",
138 .short_name = "mct_u232", 138 .short_name = "mct_u232",
diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
index 6a99ae192df1..53c0588877c0 100644
--- a/drivers/usb/serial/omninet.c
+++ b/drivers/usb/serial/omninet.c
@@ -88,7 +88,7 @@ static struct usb_driver omninet_driver = {
88}; 88};
89 89
90 90
91static struct usb_serial_device_type zyxel_omninet_device = { 91static struct usb_serial_driver zyxel_omninet_device = {
92 .owner = THIS_MODULE, 92 .owner = THIS_MODULE,
93 .name = "ZyXEL - omni.net lcd plus usb", 93 .name = "ZyXEL - omni.net lcd plus usb",
94 .short_name = "omninet", 94 .short_name = "omninet",
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 4989e5740d18..6ec9266e2e96 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -105,7 +105,7 @@ static struct usb_driver option_driver = {
105/* The card has three separate interfaces, wich the serial driver 105/* The card has three separate interfaces, wich the serial driver
106 * recognizes separately, thus num_port=1. 106 * recognizes separately, thus num_port=1.
107 */ 107 */
108static struct usb_serial_device_type option_3port_device = { 108static struct usb_serial_driver option_3port_device = {
109 .owner = THIS_MODULE, 109 .owner = THIS_MODULE,
110 .name = "Option 3G data card", 110 .name = "Option 3G data card",
111 .short_name = "option", 111 .short_name = "option",
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 3cf245bdda54..7134648e078d 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -175,7 +175,7 @@ static unsigned int pl2303_buf_get(struct pl2303_buf *pb, char *buf,
175 175
176 176
177/* All of the device info needed for the PL2303 SIO serial converter */ 177/* All of the device info needed for the PL2303 SIO serial converter */
178static struct usb_serial_device_type pl2303_device = { 178static struct usb_serial_driver pl2303_device = {
179 .owner = THIS_MODULE, 179 .owner = THIS_MODULE,
180 .name = "PL-2303", 180 .name = "PL-2303",
181 .id_table = id_table, 181 .id_table = id_table,
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index 88bf14abfa7a..87871bb647df 100644
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -397,7 +397,7 @@ static int safe_startup (struct usb_serial *serial)
397 return 0; 397 return 0;
398} 398}
399 399
400static struct usb_serial_device_type safe_device = { 400static struct usb_serial_driver safe_device = {
401 .owner = THIS_MODULE, 401 .owner = THIS_MODULE,
402 .name = "Safe", 402 .name = "Safe",
403 .id_table = id_table, 403 .id_table = id_table,
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 59c88de3e7ae..f2efaf6f3d76 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -255,7 +255,7 @@ static struct usb_driver ti_usb_driver = {
255 .id_table = ti_id_table_combined, 255 .id_table = ti_id_table_combined,
256}; 256};
257 257
258static struct usb_serial_device_type ti_1port_device = { 258static struct usb_serial_driver ti_1port_device = {
259 .owner = THIS_MODULE, 259 .owner = THIS_MODULE,
260 .name = "TI USB 3410 1 port adapter", 260 .name = "TI USB 3410 1 port adapter",
261 .id_table = ti_id_table_3410, 261 .id_table = ti_id_table_3410,
@@ -282,7 +282,7 @@ static struct usb_serial_device_type ti_1port_device = {
282 .write_bulk_callback = ti_bulk_out_callback, 282 .write_bulk_callback = ti_bulk_out_callback,
283}; 283};
284 284
285static struct usb_serial_device_type ti_2port_device = { 285static struct usb_serial_driver ti_2port_device = {
286 .owner = THIS_MODULE, 286 .owner = THIS_MODULE,
287 .name = "TI USB 5052 2 port adapter", 287 .name = "TI USB 5052 2 port adapter",
288 .id_table = ti_id_table_5052, 288 .id_table = ti_id_table_5052,
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index e77fbdfc782d..cf083da15eb4 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -823,7 +823,7 @@ static void port_release(struct device *dev)
823 823
824static struct usb_serial * create_serial (struct usb_device *dev, 824static struct usb_serial * create_serial (struct usb_device *dev,
825 struct usb_interface *interface, 825 struct usb_interface *interface,
826 struct usb_serial_device_type *type) 826 struct usb_serial_driver *driver)
827{ 827{
828 struct usb_serial *serial; 828 struct usb_serial *serial;
829 829
@@ -834,22 +834,22 @@ static struct usb_serial * create_serial (struct usb_device *dev,
834 } 834 }
835 memset (serial, 0, sizeof(*serial)); 835 memset (serial, 0, sizeof(*serial));
836 serial->dev = usb_get_dev(dev); 836 serial->dev = usb_get_dev(dev);
837 serial->type = type; 837 serial->type = driver;
838 serial->interface = interface; 838 serial->interface = interface;
839 kref_init(&serial->kref); 839 kref_init(&serial->kref);
840 840
841 return serial; 841 return serial;
842} 842}
843 843
844static struct usb_serial_device_type *search_serial_device(struct usb_interface *iface) 844static struct usb_serial_driver *search_serial_device(struct usb_interface *iface)
845{ 845{
846 struct list_head *p; 846 struct list_head *p;
847 const struct usb_device_id *id; 847 const struct usb_device_id *id;
848 struct usb_serial_device_type *t; 848 struct usb_serial_driver *t;
849 849
850 /* List trough know devices and see if the usb id matches */ 850 /* List trough know devices and see if the usb id matches */
851 list_for_each(p, &usb_serial_driver_list) { 851 list_for_each(p, &usb_serial_driver_list) {
852 t = list_entry(p, struct usb_serial_device_type, driver_list); 852 t = list_entry(p, struct usb_serial_driver, driver_list);
853 id = usb_match_id(iface, t->id_table); 853 id = usb_match_id(iface, t->id_table);
854 if (id != NULL) { 854 if (id != NULL) {
855 dbg("descriptor matches"); 855 dbg("descriptor matches");
@@ -872,7 +872,7 @@ int usb_serial_probe(struct usb_interface *interface,
872 struct usb_endpoint_descriptor *interrupt_out_endpoint[MAX_NUM_PORTS]; 872 struct usb_endpoint_descriptor *interrupt_out_endpoint[MAX_NUM_PORTS];
873 struct usb_endpoint_descriptor *bulk_in_endpoint[MAX_NUM_PORTS]; 873 struct usb_endpoint_descriptor *bulk_in_endpoint[MAX_NUM_PORTS];
874 struct usb_endpoint_descriptor *bulk_out_endpoint[MAX_NUM_PORTS]; 874 struct usb_endpoint_descriptor *bulk_out_endpoint[MAX_NUM_PORTS];
875 struct usb_serial_device_type *type = NULL; 875 struct usb_serial_driver *type = NULL;
876 int retval; 876 int retval;
877 int minor; 877 int minor;
878 int buffer_size; 878 int buffer_size;
@@ -1375,7 +1375,7 @@ module_exit(usb_serial_exit);
1375 } \ 1375 } \
1376 } while (0) 1376 } while (0)
1377 1377
1378static void fixup_generic(struct usb_serial_device_type *device) 1378static void fixup_generic(struct usb_serial_driver *device)
1379{ 1379{
1380 set_to_generic_if_null(device, open); 1380 set_to_generic_if_null(device, open);
1381 set_to_generic_if_null(device, write); 1381 set_to_generic_if_null(device, write);
@@ -1387,28 +1387,28 @@ static void fixup_generic(struct usb_serial_device_type *device)
1387 set_to_generic_if_null(device, shutdown); 1387 set_to_generic_if_null(device, shutdown);
1388} 1388}
1389 1389
1390int usb_serial_register(struct usb_serial_device_type *new_device) 1390int usb_serial_register(struct usb_serial_driver *driver)
1391{ 1391{
1392 int retval; 1392 int retval;
1393 1393
1394 fixup_generic(new_device); 1394 fixup_generic(driver);
1395 1395
1396 /* Add this device to our list of devices */ 1396 /* Add this device to our list of devices */
1397 list_add(&new_device->driver_list, &usb_serial_driver_list); 1397 list_add(&driver->driver_list, &usb_serial_driver_list);
1398 1398
1399 retval = usb_serial_bus_register(new_device); 1399 retval = usb_serial_bus_register(driver);
1400 if (retval) { 1400 if (retval) {
1401 err("problem %d when registering driver %s", retval, new_device->name); 1401 err("problem %d when registering driver %s", retval, driver->name);
1402 list_del(&new_device->driver_list); 1402 list_del(&driver->driver_list);
1403 } 1403 }
1404 else 1404 else
1405 info("USB Serial support registered for %s", new_device->name); 1405 info("USB Serial support registered for %s", driver->name);
1406 1406
1407 return retval; 1407 return retval;
1408} 1408}
1409 1409
1410 1410
1411void usb_serial_deregister(struct usb_serial_device_type *device) 1411void usb_serial_deregister(struct usb_serial_driver *device)
1412{ 1412{
1413 info("USB Serial deregistering driver %s", device->name); 1413 info("USB Serial deregistering driver %s", device->name);
1414 list_del(&device->driver_list); 1414 list_del(&device->driver_list);
diff --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
index 57f92f054c75..d6738b1b0429 100644
--- a/drivers/usb/serial/usb-serial.h
+++ b/drivers/usb/serial/usb-serial.h
@@ -143,7 +143,7 @@ static inline void usb_set_serial_port_data (struct usb_serial_port *port, void
143/** 143/**
144 * usb_serial - structure used by the usb-serial core for a device 144 * usb_serial - structure used by the usb-serial core for a device
145 * @dev: pointer to the struct usb_device for this device 145 * @dev: pointer to the struct usb_device for this device
146 * @type: pointer to the struct usb_serial_device_type for this device 146 * @type: pointer to the struct usb_serial_driver for this device
147 * @interface: pointer to the struct usb_interface for this device 147 * @interface: pointer to the struct usb_interface for this device
148 * @minor: the starting minor number for this device 148 * @minor: the starting minor number for this device
149 * @num_ports: the number of ports this device has 149 * @num_ports: the number of ports this device has
@@ -159,7 +159,7 @@ static inline void usb_set_serial_port_data (struct usb_serial_port *port, void
159 */ 159 */
160struct usb_serial { 160struct usb_serial {
161 struct usb_device * dev; 161 struct usb_device * dev;
162 struct usb_serial_device_type * type; 162 struct usb_serial_driver * type;
163 struct usb_interface * interface; 163 struct usb_interface * interface;
164 unsigned char minor; 164 unsigned char minor;
165 unsigned char num_ports; 165 unsigned char num_ports;
@@ -188,11 +188,11 @@ static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
188} 188}
189 189
190/** 190/**
191 * usb_serial_device_type - a structure that defines a usb serial device 191 * usb_serial_driver - describes a usb serial driver
192 * @owner: pointer to the module that owns this device. 192 * @owner: pointer to the module that owns this driver.
193 * @name: pointer to a string that describes this device. This string used 193 * @name: pointer to a string that describes this driver. This string used
194 * in the syslog messages when a device is inserted or removed. 194 * in the syslog messages when a device is inserted or removed.
195 * @short_name: a pointer to a string that describes this device in 195 * @short_name: a pointer to a string that describes this driver in
196 * KOBJ_NAME_LEN characters or less. This is used for the sysfs interface 196 * KOBJ_NAME_LEN characters or less. This is used for the sysfs interface
197 * to describe the driver. 197 * to describe the driver.
198 * @id_table: pointer to a list of usb_device_id structures that define all 198 * @id_table: pointer to a list of usb_device_id structures that define all
@@ -221,13 +221,13 @@ static inline void usb_set_serial_data (struct usb_serial *serial, void *data)
221 * @shutdown: pointer to the driver's shutdown function. This will be 221 * @shutdown: pointer to the driver's shutdown function. This will be
222 * called when the device is removed from the system. 222 * called when the device is removed from the system.
223 * 223 *
224 * This structure is defines a USB Serial device. It provides all of 224 * This structure is defines a USB Serial driver. It provides all of
225 * the information that the USB serial core code needs. If the function 225 * the information that the USB serial core code needs. If the function
226 * pointers are defined, then the USB serial core code will call them when 226 * pointers are defined, then the USB serial core code will call them when
227 * the corresponding tty port functions are called. If they are not 227 * the corresponding tty port functions are called. If they are not
228 * called, the generic serial function will be used instead. 228 * called, the generic serial function will be used instead.
229 */ 229 */
230struct usb_serial_device_type { 230struct usb_serial_driver {
231 struct module *owner; 231 struct module *owner;
232 char *name; 232 char *name;
233 char *short_name; 233 char *short_name;
@@ -269,10 +269,10 @@ struct usb_serial_device_type {
269 void (*read_bulk_callback)(struct urb *urb, struct pt_regs *regs); 269 void (*read_bulk_callback)(struct urb *urb, struct pt_regs *regs);
270 void (*write_bulk_callback)(struct urb *urb, struct pt_regs *regs); 270 void (*write_bulk_callback)(struct urb *urb, struct pt_regs *regs);
271}; 271};
272#define to_usb_serial_driver(d) container_of(d, struct usb_serial_device_type, driver) 272#define to_usb_serial_driver(d) container_of(d, struct usb_serial_driver, driver)
273 273
274extern int usb_serial_register(struct usb_serial_device_type *new_device); 274extern int usb_serial_register(struct usb_serial_driver *driver);
275extern void usb_serial_deregister(struct usb_serial_device_type *device); 275extern void usb_serial_deregister(struct usb_serial_driver *driver);
276extern void usb_serial_port_softint(void *private); 276extern void usb_serial_port_softint(void *private);
277 277
278extern int usb_serial_probe(struct usb_interface *iface, const struct usb_device_id *id); 278extern int usb_serial_probe(struct usb_interface *iface, const struct usb_device_id *id);
@@ -303,10 +303,10 @@ extern void usb_serial_generic_shutdown (struct usb_serial *serial);
303extern int usb_serial_generic_register (int debug); 303extern int usb_serial_generic_register (int debug);
304extern void usb_serial_generic_deregister (void); 304extern void usb_serial_generic_deregister (void);
305 305
306extern int usb_serial_bus_register (struct usb_serial_device_type *device); 306extern int usb_serial_bus_register (struct usb_serial_driver *device);
307extern void usb_serial_bus_deregister (struct usb_serial_device_type *device); 307extern void usb_serial_bus_deregister (struct usb_serial_driver *device);
308 308
309extern struct usb_serial_device_type usb_serial_generic_device; 309extern struct usb_serial_driver usb_serial_generic_device;
310extern struct bus_type usb_serial_bus_type; 310extern struct bus_type usb_serial_bus_type;
311extern struct tty_driver *usb_serial_tty_driver; 311extern struct tty_driver *usb_serial_tty_driver;
312 312
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 31c57adcb623..825451b3788c 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -311,7 +311,7 @@ static struct usb_driver visor_driver = {
311}; 311};
312 312
313/* All of the device info needed for the Handspring Visor, and Palm 4.0 devices */ 313/* All of the device info needed for the Handspring Visor, and Palm 4.0 devices */
314static struct usb_serial_device_type handspring_device = { 314static struct usb_serial_driver handspring_device = {
315 .owner = THIS_MODULE, 315 .owner = THIS_MODULE,
316 .name = "Handspring Visor / Palm OS", 316 .name = "Handspring Visor / Palm OS",
317 .short_name = "visor", 317 .short_name = "visor",
@@ -339,7 +339,7 @@ static struct usb_serial_device_type handspring_device = {
339}; 339};
340 340
341/* All of the device info needed for the Clie UX50, TH55 Palm 5.0 devices */ 341/* All of the device info needed for the Clie UX50, TH55 Palm 5.0 devices */
342static struct usb_serial_device_type clie_5_device = { 342static struct usb_serial_driver clie_5_device = {
343 .owner = THIS_MODULE, 343 .owner = THIS_MODULE,
344 .name = "Sony Clie 5.0", 344 .name = "Sony Clie 5.0",
345 .short_name = "clie_5", 345 .short_name = "clie_5",
@@ -367,7 +367,7 @@ static struct usb_serial_device_type clie_5_device = {
367}; 367};
368 368
369/* device info for the Sony Clie OS version 3.5 */ 369/* device info for the Sony Clie OS version 3.5 */
370static struct usb_serial_device_type clie_3_5_device = { 370static struct usb_serial_driver clie_3_5_device = {
371 .owner = THIS_MODULE, 371 .owner = THIS_MODULE,
372 .name = "Sony Clie 3.5", 372 .name = "Sony Clie 3.5",
373 .short_name = "clie_3.5", 373 .short_name = "clie_3.5",
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index cf3bc30675a1..dc06664bfa0e 100644
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -156,7 +156,7 @@ static void whiteheat_unthrottle (struct usb_serial_port *port);
156static void whiteheat_read_callback (struct urb *urb, struct pt_regs *regs); 156static void whiteheat_read_callback (struct urb *urb, struct pt_regs *regs);
157static void whiteheat_write_callback (struct urb *urb, struct pt_regs *regs); 157static void whiteheat_write_callback (struct urb *urb, struct pt_regs *regs);
158 158
159static struct usb_serial_device_type whiteheat_fake_device = { 159static struct usb_serial_driver whiteheat_fake_device = {
160 .owner = THIS_MODULE, 160 .owner = THIS_MODULE,
161 .name = "Connect Tech - WhiteHEAT - (prerenumeration)", 161 .name = "Connect Tech - WhiteHEAT - (prerenumeration)",
162 .short_name = "whiteheatnofirm", 162 .short_name = "whiteheatnofirm",
@@ -169,7 +169,7 @@ static struct usb_serial_device_type whiteheat_fake_device = {
169 .attach = whiteheat_firmware_attach, 169 .attach = whiteheat_firmware_attach,
170}; 170};
171 171
172static struct usb_serial_device_type whiteheat_device = { 172static struct usb_serial_driver whiteheat_device = {
173 .owner = THIS_MODULE, 173 .owner = THIS_MODULE,
174 .name = "Connect Tech - WhiteHEAT", 174 .name = "Connect Tech - WhiteHEAT",
175 .short_name = "whiteheat", 175 .short_name = "whiteheat",