Skip to content

Commit

Permalink
USB: serial: io_edgeport.c: use module_usb_serial_driver
Browse files Browse the repository at this point in the history
This converts the io_edgeport.c driver to use the module_usb_serial_driver() call
instead of having to have a module_init/module_exit function, saving a lot
of duplicated code.

CC: Johan Hovold <jhovold@gmail.com>
CC: Rusty Russell <rusty@rustcorp.com.au>
CC: Huzaifa Sidhpurwala <huzaifas@redhat.com>
CC: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Feb 28, 2012
1 parent 68e9c9a commit 36ccce4
Showing 1 changed file with 3 additions and 32 deletions.
35 changes: 3 additions & 32 deletions drivers/usb/serial/io_edgeport.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -3180,38 +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_drivers(&io_driver, serial_drivers);
if (retval == 0) {
atomic_set(&CmdUrbs, 0);
printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
DRIVER_DESC "\n");
}
return retval;
}


/****************************************************************************
* edgeport_exit
* Called when the driver is about to be unloaded.
****************************************************************************/
static void __exit edgeport_exit (void)
{
usb_serial_deregister_drivers(&io_driver, serial_drivers);
}

module_init(edgeport_init);
module_exit(edgeport_exit);

/* Module information */
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL");
Expand Down

0 comments on commit 36ccce4

Please sign in to comment.