summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-sjoy.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-12-17 15:28:26 -0700
committerJiri Kosina <jkosina@suse.cz>2013-01-03 10:27:31 +0100
commitf425458eafd51b6b5ab64f407922e1198c567cb2 (patch)
treea597cc8f7ba8e878f7eb1decea211173adcd44e0 /drivers/hid/hid-sjoy.c
parentd463f4719a2fa883bc0bb1fb67e6fea2307aa6df (diff)
HID: Use module_hid_driver macro
Use the new module_hid_driver macro in all HID drivers that have a simple register/unregister init/exit. This also converts the hid drivers that test for a failure of hid_register_driver() and report the failure. Using module_hid_driver in those drivers removes the failure message. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-sjoy.c')
-rw-r--r--drivers/hid/hid-sjoy.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c
index 42257acfeb73..28f774003f03 100644
--- a/drivers/hid/hid-sjoy.c
+++ b/drivers/hid/hid-sjoy.c
@@ -177,19 +177,8 @@ static struct hid_driver sjoy_driver = {
.id_table = sjoy_devices,
.probe = sjoy_probe,
};
+module_hid_driver(sjoy_driver);
-static int __init sjoy_init(void)
-{
- return hid_register_driver(&sjoy_driver);
-}
-
-static void __exit sjoy_exit(void)
-{
- hid_unregister_driver(&sjoy_driver);
-}
-
-module_init(sjoy_init);
-module_exit(sjoy_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Jussi Kivilinna");