Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[~andy/linux] / drivers / staging / media / lirc / lirc_imon.c

diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index c1654b18610ea3480d361d290915dd6a016bb5cc..5f7f8cd3a66148bed7b5dfae551f6919d96c7454 100644 (file)
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -1025,26 +1025,4 @@ static int imon_resume(struct usb_interface *intf)
        return rc;
 }
 
-static int __init imon_init(void)
-{
-       int rc;
-
-       printk(KERN_INFO MOD_NAME ": " MOD_DESC ", v" MOD_VERSION "\n");
-
-       rc = usb_register(&imon_driver);
-       if (rc) {
-               err("%s: usb register failed(%d)", __func__, rc);
-               return -ENODEV;
-       }
-
-       return 0;
-}
-
-static void __exit imon_exit(void)
-{
-       usb_deregister(&imon_driver);
-       printk(KERN_INFO MOD_NAME ": module removed. Goodbye!\n");
-}
-
-module_init(imon_init);
-module_exit(imon_exit);
+module_usb_driver(imon_driver);