aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-apple.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-apple.c
parentHID: hid.h: remove unused hid_generic_{init,exit} prototypes (diff)
downloadlinux-dev-f425458eafd51b6b5ab64f407922e1198c567cb2.tar.xz
linux-dev-f425458eafd51b6b5ab64f407922e1198c567cb2.zip
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-apple.c')
-rw-r--r--drivers/hid/hid-apple.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index d0f7662aacca..320a958d4139 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -555,23 +555,6 @@ static struct hid_driver apple_driver = {
.input_mapping = apple_input_mapping,
.input_mapped = apple_input_mapped,
};
+module_hid_driver(apple_driver);
-static int __init apple_init(void)
-{
- int ret;
-
- ret = hid_register_driver(&apple_driver);
- if (ret)
- pr_err("can't register apple driver\n");
-
- return ret;
-}
-
-static void __exit apple_exit(void)
-{
- hid_unregister_driver(&apple_driver);
-}
-
-module_init(apple_init);
-module_exit(apple_exit);
MODULE_LICENSE("GPL");