From: Greg Kroah-Hartman Date: Wed, 25 Apr 2012 21:33:06 +0000 (-0700) Subject: USB: staging: media: as102: convert to use module_usb_driver X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9451df0ee893dbdfca626f2888654f321d241460;p=openwrt%2Fstaging%2Fblogic.git USB: staging: media: as102: convert to use module_usb_driver The as102 driver can be converted to use module_usb_driver() which saves a lot of code, and gets rid of an unwanted err() call at the same time. Cc: Mauro Carvalho Chehab Cc: Sylwester Nawrocki Cc: Piotr Chmura Cc: Devin Heitmueller Cc: Randy Dunlap Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c index ea4f992de235..ac92eaf6c74b 100644 --- a/drivers/staging/media/as102/as102_drv.c +++ b/drivers/staging/media/as102/as102_drv.c @@ -279,40 +279,8 @@ void as102_dvb_unregister(struct as102_dev_t *as102_dev) pr_info("Unregistered device %s", as102_dev->name); } -static int __init as102_driver_init(void) -{ - int ret; - - /* register this driver with the low level subsystem */ - ret = usb_register(&as102_usb_driver); - if (ret) - err("usb_register failed (ret = %d)", ret); - - return ret; -} - -/* - * Mandatory function : Adds a special section to the module indicating - * where initialisation function is defined - */ -module_init(as102_driver_init); - -/** - * as102_driver_exit - as102 driver exit point - * - * This function is called when device has to be removed. - */ -static void __exit as102_driver_exit(void) -{ - /* deregister this driver with the low level bus subsystem */ - usb_deregister(&as102_usb_driver); -} +module_usb_driver(as102_usb_driver); -/* - * required function for unload: Adds a special section to the module - * indicating where unload function is defined - */ -module_exit(as102_driver_exit); /* modinfo details */ MODULE_DESCRIPTION(DRIVER_FULL_NAME); MODULE_LICENSE("GPL");