aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/keyspan.h
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2012-02-23 14:57:09 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-24 15:39:19 -0500
commit4d2a7aff1062048ea59214b49ca1d915586d6d6d (patch)
tree42e5426b6bb4abeee669d2dd709fb1285836b043 /drivers/usb/serial/keyspan.h
parent7dbe2460989b10644651e779b17b683627feea48 (diff)
usb-serial: use new registration API in [k-m]* drivers
This patch (as1526) modifies the following usb-serial drivers to utilize the new usb_serial_{de}register_drivers() routines: keyspan, kl5kusb105, kobil_sct, mct_u232, mos7720, mos7840, and moto_modem. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/keyspan.h')
-rw-r--r--drivers/usb/serial/keyspan.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 13fa1d1cc900..622853c9e384 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -492,7 +492,6 @@ static struct usb_driver keyspan_driver = {
492 .probe = usb_serial_probe, 492 .probe = usb_serial_probe,
493 .disconnect = usb_serial_disconnect, 493 .disconnect = usb_serial_disconnect,
494 .id_table = keyspan_ids_combined, 494 .id_table = keyspan_ids_combined,
495 .no_dynamic_id = 1,
496}; 495};
497 496
498/* usb_device_id table for the pre-firmware download keyspan devices */ 497/* usb_device_id table for the pre-firmware download keyspan devices */
@@ -545,7 +544,6 @@ static struct usb_serial_driver keyspan_pre_device = {
545 .name = "keyspan_no_firm", 544 .name = "keyspan_no_firm",
546 }, 545 },
547 .description = "Keyspan - (without firmware)", 546 .description = "Keyspan - (without firmware)",
548 .usb_driver = &keyspan_driver,
549 .id_table = keyspan_pre_ids, 547 .id_table = keyspan_pre_ids,
550 .num_ports = 1, 548 .num_ports = 1,
551 .attach = keyspan_fake_startup, 549 .attach = keyspan_fake_startup,
@@ -557,7 +555,6 @@ static struct usb_serial_driver keyspan_1port_device = {
557 .name = "keyspan_1", 555 .name = "keyspan_1",
558 }, 556 },
559 .description = "Keyspan 1 port adapter", 557 .description = "Keyspan 1 port adapter",
560 .usb_driver = &keyspan_driver,
561 .id_table = keyspan_1port_ids, 558 .id_table = keyspan_1port_ids,
562 .num_ports = 1, 559 .num_ports = 1,
563 .open = keyspan_open, 560 .open = keyspan_open,
@@ -580,7 +577,6 @@ static struct usb_serial_driver keyspan_2port_device = {
580 .name = "keyspan_2", 577 .name = "keyspan_2",
581 }, 578 },
582 .description = "Keyspan 2 port adapter", 579 .description = "Keyspan 2 port adapter",
583 .usb_driver = &keyspan_driver,
584 .id_table = keyspan_2port_ids, 580 .id_table = keyspan_2port_ids,
585 .num_ports = 2, 581 .num_ports = 2,
586 .open = keyspan_open, 582 .open = keyspan_open,
@@ -603,7 +599,6 @@ static struct usb_serial_driver keyspan_4port_device = {
603 .name = "keyspan_4", 599 .name = "keyspan_4",
604 }, 600 },
605 .description = "Keyspan 4 port adapter", 601 .description = "Keyspan 4 port adapter",
606 .usb_driver = &keyspan_driver,
607 .id_table = keyspan_4port_ids, 602 .id_table = keyspan_4port_ids,
608 .num_ports = 4, 603 .num_ports = 4,
609 .open = keyspan_open, 604 .open = keyspan_open,
@@ -620,4 +615,9 @@ static struct usb_serial_driver keyspan_4port_device = {
620 .release = keyspan_release, 615 .release = keyspan_release,
621}; 616};
622 617
618static struct usb_serial_driver * const serial_drivers[] = {
619 &keyspan_pre_device, &keyspan_1port_device,
620 &keyspan_2port_device, &keyspan_4port_device, NULL
621};
622
623#endif 623#endif