1 files changed, 5 insertions, 61 deletions

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 0497575e4799..323e87235711 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -193,7 +193,8 @@ static const struct divisor_table_entry divisor_table[] = {
 /* local variables */
 static bool debug;
 
-static atomic_t CmdUrbs;        /* Number of outstanding Command Write Urbs */
+/* Number of outstanding Command Write Urbs */
+static atomic_t CmdUrbs = ATOMIC_INIT(0);
 
 
 /* local function prototypes */
@@ -1286,7 +1287,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         count = fifo->count;
         buffer = kmalloc(count+2, GFP_ATOMIC);
         if (buffer == NULL) {
-                dev_err(&edge_port->port->dev,
+                dev_err_console(edge_port->port,
                                 "%s - no more kernel memory...\n", __func__);
                 edge_port->write_in_progress = false;
                 goto exit_send;
@@ -1331,7 +1332,7 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status) {
                 /* something went wrong */
-                dev_err(&edge_port->port->dev,
+                dev_err_console(edge_port->port,
                         "%s - usb_submit_urb(write bulk) failed, status = %d, data lost\n",
                                 __func__, status);
                 edge_port->write_in_progress = false;
@@ -3180,65 +3181,8 @@ static void edge_release(struct usb_serial *serial)
         kfree(edge_serial);
 }
 
+module_usb_serial_driver(io_driver, serial_drivers);
 
-/****************************************************************************
- * edgeport_init
- *      This is called by the module subsystem, or on startup to initialize us
- ****************************************************************************/
-static int __init edgeport_init(void)
-{
-        int retval;
-
-        retval = usb_serial_register(&edgeport_2port_device);
-        if (retval)
-                goto failed_2port_device_register;
-        retval = usb_serial_register(&edgeport_4port_device);
-        if (retval)
-                goto failed_4port_device_register;
-        retval = usb_serial_register(&edgeport_8port_device);
-        if (retval)
-                goto failed_8port_device_register;
-        retval = usb_serial_register(&epic_device);
-        if (retval)
-                goto failed_epic_device_register;
-        retval = usb_register(&io_driver);
-        if (retval)
-                goto failed_usb_register;
-        atomic_set(&CmdUrbs, 0);
-        printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
-               DRIVER_DESC "\n");
-        return 0;
-
-failed_usb_register:
-        usb_serial_deregister(&epic_device);
-failed_epic_device_register:
-        usb_serial_deregister(&edgeport_8port_device);
-failed_8port_device_register:
-        usb_serial_deregister(&edgeport_4port_device);
-failed_4port_device_register:
-        usb_serial_deregister(&edgeport_2port_device);
-failed_2port_device_register:
-        return retval;
-}
-
-
-/****************************************************************************
- * edgeport_exit
- *      Called when the driver is about to be unloaded.
- ****************************************************************************/
-static void __exit edgeport_exit (void)
-{
-        usb_deregister(&io_driver);
-        usb_serial_deregister(&edgeport_2port_device);
-        usb_serial_deregister(&edgeport_4port_device);
-        usb_serial_deregister(&edgeport_8port_device);
-        usb_serial_deregister(&epic_device);
-}
-
-module_init(edgeport_init);
-module_exit(edgeport_exit);
-
-/* Module information */
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");