diff options
| author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:33:39 -0700 |
|---|---|---|
| committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:13:52 -0700 |
| commit | 9c0157faa3a789b03c375b40af9aa10e9ca00f95 (patch) | |
| tree | 696db26c08df491e9cdf2814e84ed853c1e926b6 | |
| parent | 34b63ad93ba6d686eaba27166a5bc84d7a664a89 (diff) | |
Revert "hid: Nvidia shield joystic and Blake controller"
DO NOT INTEGRATE
Bug 1466757
This reverts commit a96c9be87c663e1ec7b4105bb30a3c77357f405e.
Change-Id: Ibeae9abe43ec747853bbf25cd79c420b0bdf7da0
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428072
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, 2 insertions, 26 deletions
diff --git a/drivers/hid/hid-nvidia-blake.c b/drivers/hid/hid-nvidia-blake.c index f5a8334e2262..78fa814d7333 100644 --- a/drivers/hid/hid-nvidia-blake.c +++ b/drivers/hid/hid-nvidia-blake.c @@ -254,19 +254,7 @@ static struct hid_driver nvidia_driver = { .raw_event = nvidia_raw_event, .probe = nvidia_probe, }; - -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_hid_driver(nvidia_driver); 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 c7cd8a2689b9..29a4ae2a4a16 100644 --- a/drivers/hid/hid-nvidia.c +++ b/drivers/hid/hid-nvidia.c @@ -77,19 +77,7 @@ static struct hid_driver nvidia_driver = { .id_table = nvidia_devices, .input_mapped = nvidia_input_mapped, }; - -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_hid_driver(nvidia_driver); MODULE_AUTHOR("Jun Yan <juyan@nvidia.com>"); MODULE_LICENSE("GPL"); |