53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Date: Mon, 23 Apr 2012 16:13:19 -0700
|
|
Subject: [024/106] Staging: line6: use module_usb_driver()
|
|
|
|
commit 4a6313644c3188f4aa1a6b4403896375baa2e09a upstream.
|
|
|
|
Now that our module_init/exit path is just registering and unregistering
|
|
the usb driver, we can use module_usb_driver() instead. This also has
|
|
the nice side affect of removing the unneeded printk for the module
|
|
version number.
|
|
|
|
CC: Markus Grabner <grabner@icg.tugraz.at>
|
|
CC: Stefan Hajnoczi <stefanha@gmail.com>
|
|
CC: Julia Lawall <julia@diku.dk>
|
|
CC: Dan Carpenter <dan.carpenter@oracle.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/line6/driver.c | 21 +--------------------
|
|
1 file changed, 1 insertion(+), 20 deletions(-)
|
|
|
|
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c
|
|
index c476fcc..4513f78 100644
|
|
--- a/drivers/staging/line6/driver.c
|
|
+++ b/drivers/staging/line6/driver.c
|
|
@@ -1300,26 +1300,7 @@ static struct usb_driver line6_driver = {
|
|
.id_table = line6_id_table,
|
|
};
|
|
|
|
-/*
|
|
- Module initialization.
|
|
-*/
|
|
-static int __init line6_init(void)
|
|
-{
|
|
- printk(KERN_INFO "%s driver version %s\n", DRIVER_NAME, DRIVER_VERSION);
|
|
-
|
|
- return usb_register(&line6_driver);
|
|
-}
|
|
-
|
|
-/*
|
|
- Module cleanup.
|
|
-*/
|
|
-static void __exit line6_exit(void)
|
|
-{
|
|
- usb_deregister(&line6_driver);
|
|
-}
|
|
-
|
|
-module_init(line6_init);
|
|
-module_exit(line6_exit);
|
|
+module_usb_driver(line6_driver);
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|