Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi...

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / pcwd_usb.c

diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index 748a74bd85e716173135146bc9d1e839b9d8f1ec..d8de1ddd176add762617b9dc122f79a5426ed1ab 100644 (file)
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -827,37 +827,4 @@ static void usb_pcwd_disconnect(struct usb_interface *interface)
        printk(KERN_INFO PFX "USB PC Watchdog disconnected\n");
 }
 
-
-
-/**
- *     usb_pcwd_init
- */
-static int __init usb_pcwd_init(void)
-{
-       int result;
-
-       /* register this driver with the USB subsystem */
-       result = usb_register(&usb_pcwd_driver);
-       if (result) {
-               printk(KERN_ERR PFX "usb_register failed. Error number %d\n",
-                   result);
-               return result;
-       }
-
-       printk(KERN_INFO PFX DRIVER_DESC " v" DRIVER_VERSION "\n");
-       return 0;
-}
-
-
-/**
- *     usb_pcwd_exit
- */
-static void __exit usb_pcwd_exit(void)
-{
-       /* deregister this driver with the USB subsystem */
-       usb_deregister(&usb_pcwd_driver);
-}
-
-
-module_init(usb_pcwd_init);
-module_exit(usb_pcwd_exit);
+module_usb_driver(usb_pcwd_driver);