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

[~andy/linux] / drivers / media / rc / imon.c

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3f175ebe27660980f3a5f53ea46b4e7527502e6e..7f26fdf2e54e4a9498264f7b92155fb146887d9c 100644 (file)
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2476,23 +2476,4 @@ static int imon_resume(struct usb_interface *intf)
        return rc;
 }
 
-static int __init imon_init(void)
-{
-       int rc;
-
-       rc = usb_register(&imon_driver);
-       if (rc) {
-               pr_err("usb register failed(%d)\n", rc);
-               rc = -ENODEV;
-       }
-
-       return rc;
-}
-
-static void __exit imon_exit(void)
-{
-       usb_deregister(&imon_driver);
-}
-
-module_init(imon_init);
-module_exit(imon_exit);
+module_usb_driver(imon_driver);