aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/moto_modem.c
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/moto_modem.c
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/moto_modem.c')
-rw-r--r--drivers/usb/serial/moto_modem.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/usb/serial/moto_modem.c b/drivers/usb/serial/moto_modem.c
index e2bfecc46402..0af57d31ab82 100644
--- a/drivers/usb/serial/moto_modem.c
+++ b/drivers/usb/serial/moto_modem.c
@@ -36,7 +36,6 @@ static struct usb_driver moto_driver = {
36 .probe = usb_serial_probe, 36 .probe = usb_serial_probe,
37 .disconnect = usb_serial_disconnect, 37 .disconnect = usb_serial_disconnect,
38 .id_table = id_table, 38 .id_table = id_table,
39 .no_dynamic_id = 1,
40}; 39};
41 40
42static struct usb_serial_driver moto_device = { 41static struct usb_serial_driver moto_device = {
@@ -45,27 +44,21 @@ static struct usb_serial_driver moto_device = {
45 .name = "moto-modem", 44 .name = "moto-modem",
46 }, 45 },
47 .id_table = id_table, 46 .id_table = id_table,
48 .usb_driver = &moto_driver,
49 .num_ports = 1, 47 .num_ports = 1,
50}; 48};
51 49
50static struct usb_serial_driver * const serial_drivers[] = {
51 &moto_device, NULL
52};
53
52static int __init moto_init(void) 54static int __init moto_init(void)
53{ 55{
54 int retval; 56 return usb_serial_register_drivers(&moto_driver, serial_drivers);
55
56 retval = usb_serial_register(&moto_device);
57 if (retval)
58 return retval;
59 retval = usb_register(&moto_driver);
60 if (retval)
61 usb_serial_deregister(&moto_device);
62 return retval;
63} 57}
64 58
65static void __exit moto_exit(void) 59static void __exit moto_exit(void)
66{ 60{
67 usb_deregister(&moto_driver); 61 usb_serial_deregister_drivers(&moto_driver, serial_drivers);
68 usb_serial_deregister(&moto_device);
69} 62}
70 63
71module_init(moto_init); 64module_init(moto_init);