Merge remote-tracking branch 'regulator/fix/dbx500' into regulator-linus

[~andy/linux] / drivers / staging / media / as102 / as102_drv.c

diff --git a/drivers/staging/media/as102/as102_drv.c b/drivers/staging/media/as102/as102_drv.c
index ea4f992de235a3f1962d6548c32b01e8b983368c..ac92eaf6c74b74697ef86a3e615a7a87cfcd1d2e 100644 (file)
--- 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");