diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-04-24 16:03:18 +0900 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-12 21:54:52 -0700 |
| commit | a96c9be87c663e1ec7b4105bb30a3c77357f405e (patch) | |
| tree | ca0b38c95cfad44d4ede0637f2620a505ddb83f2 | |
| parent | cf56f98a8147c0de6f6d393248d559054523a6d7 (diff) | |
hid: Nvidia shield joystic and Blake controller
module_init() and module_exit() replace module_hid_driver().
module_hid_driver() is not applicable on kernel 3.4
Bug 1466757
Change-Id: I29e6600f1b32b406bc23c628c4ddb0b278f3daa2
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/401212
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/417522
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
| -rw-r--r-- | drivers/hid/hid-nvidia-blake.c | 14 | ||||
| -rw-r--r-- | drivers/hid/hid-nvidia.c | 14 |
2 files changed, 26 insertions, 2 deletions
diff --git a/drivers/hid/hid-nvidia-blake.c b/drivers/hid/hid-nvidia-blake.c index 78fa814d7333..f5a8334e2262 100644 --- a/drivers/hid/hid-nvidia-blake.c +++ b/drivers/hid/hid-nvidia-blake.c @@ -254,7 +254,19 @@ static struct hid_driver nvidia_driver = { .raw_event = nvidia_raw_event, .probe = nvidia_probe, }; -module_hid_driver(nvidia_driver); + +static int __init hid_nvidia_blake_init(void) +{ + return hid_register_driver(&nvidia_driver); +} + +static void __exit hid_nvidia_blake_exit(void) +{ + hid_unregister_driver(&nvidia_driver); +} + +module_init(hid_nvidia_blake_init); +module_exit(hid_nvidia_blake_exit) MODULE_AUTHOR("Jun Yan <juyan@nvidia.com>"); MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-nvidia.c b/drivers/hid/hid-nvidia.c index 29a4ae2a4a16..c7cd8a2689b9 100644 --- a/drivers/hid/hid-nvidia.c +++ b/drivers/hid/hid-nvidia.c @@ -77,7 +77,19 @@ static struct hid_driver nvidia_driver = { .id_table = nvidia_devices, .input_mapped = nvidia_input_mapped, }; -module_hid_driver(nvidia_driver); + +static int __init hid_nvidia_shield_init(void) +{ + return hid_register_driver(&nvidia_driver); +} + +static void __exit hid_nvidia_shield_exit(void) +{ + hid_unregister_driver(&nvidia_driver); +} + +module_init(hid_nvidia_shield_init); +module_exit(hid_nvidia_shield_exit) MODULE_AUTHOR("Jun Yan <juyan@nvidia.com>"); MODULE_LICENSE("GPL"); |