diff options
author | Marc Dietrich <marvin24@gmx.de> | 2012-06-24 17:25:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-25 13:55:37 -0400 |
commit | 9891b1ce6276912c54f66b7b0c8c1bcc42ca75eb (patch) | |
tree | 8530141374451c4ee19bd6615bde9af6d73fa173 | |
parent | 50d4656a2304e48917a8e2b9df99f69d50b8a0aa (diff) |
staging: nvec: cleanup driver registration
This patch simplifies code by using the module_platform_driver
macro.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/nvec/nvec.c | 7 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_kbd.c | 7 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_leds.c | 14 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_power.c | 7 | ||||
-rw-r--r-- | drivers/staging/nvec/nvec_ps2.c | 7 |
5 files changed, 5 insertions, 37 deletions
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 39dbaa0ac6a..09b7e129fc2 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c | |||
@@ -917,12 +917,7 @@ static struct platform_driver nvec_device_driver = { | |||
917 | } | 917 | } |
918 | }; | 918 | }; |
919 | 919 | ||
920 | static int __init tegra_nvec_init(void) | 920 | module_platform_driver(nvec_device_driver); |
921 | { | ||
922 | return platform_driver_register(&nvec_device_driver); | ||
923 | } | ||
924 | |||
925 | module_init(tegra_nvec_init); | ||
926 | 921 | ||
927 | MODULE_ALIAS("platform:nvec"); | 922 | MODULE_ALIAS("platform:nvec"); |
928 | MODULE_DESCRIPTION("NVIDIA compliant embedded controller interface"); | 923 | MODULE_DESCRIPTION("NVIDIA compliant embedded controller interface"); |
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index a4ce5a740e2..36ef6a6b01a 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c | |||
@@ -167,12 +167,7 @@ static struct platform_driver nvec_kbd_driver = { | |||
167 | }, | 167 | }, |
168 | }; | 168 | }; |
169 | 169 | ||
170 | static int __init nvec_kbd_init(void) | 170 | module_platform_driver(nvec_kbd_driver); |
171 | { | ||
172 | return platform_driver_register(&nvec_kbd_driver); | ||
173 | } | ||
174 | |||
175 | module_init(nvec_kbd_init); | ||
176 | 171 | ||
177 | MODULE_AUTHOR("Marc Dietrich <marvin24@gmx.de>"); | 172 | MODULE_AUTHOR("Marc Dietrich <marvin24@gmx.de>"); |
178 | MODULE_DESCRIPTION("NVEC keyboard driver"); | 173 | MODULE_DESCRIPTION("NVEC keyboard driver"); |
diff --git a/drivers/staging/nvec/nvec_leds.c b/drivers/staging/nvec/nvec_leds.c index 91947fb8606..53cb5711afa 100644 --- a/drivers/staging/nvec/nvec_leds.c +++ b/drivers/staging/nvec/nvec_leds.c | |||
@@ -90,19 +90,7 @@ static struct platform_driver nvec_led_driver = { | |||
90 | }, | 90 | }, |
91 | }; | 91 | }; |
92 | 92 | ||
93 | static int __init nvec_led_init(void) | 93 | module_platform_driver(nvec_led_driver); |
94 | { | ||
95 | return platform_driver_register(&nvec_led_driver); | ||
96 | } | ||
97 | |||
98 | module_init(nvec_led_init); | ||
99 | |||
100 | static void __exit nvec_led_exit(void) | ||
101 | { | ||
102 | platform_driver_unregister(&nvec_led_driver); | ||
103 | } | ||
104 | |||
105 | module_exit(nvec_led_exit); | ||
106 | 94 | ||
107 | MODULE_AUTHOR("Ilya Petrov <ilya.muromec@gmail.com>"); | 95 | MODULE_AUTHOR("Ilya Petrov <ilya.muromec@gmail.com>"); |
108 | MODULE_DESCRIPTION("Tegra NVEC LED driver"); | 96 | MODULE_DESCRIPTION("Tegra NVEC LED driver"); |
diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c index a23e5485c27..063f6d5e8ab 100644 --- a/drivers/staging/nvec/nvec_power.c +++ b/drivers/staging/nvec/nvec_power.c | |||
@@ -415,12 +415,7 @@ static struct platform_driver nvec_power_driver = { | |||
415 | } | 415 | } |
416 | }; | 416 | }; |
417 | 417 | ||
418 | static int __init nvec_power_init(void) | 418 | module_platform_driver(nvec_power_driver); |
419 | { | ||
420 | return platform_driver_register(&nvec_power_driver); | ||
421 | } | ||
422 | |||
423 | module_init(nvec_power_init); | ||
424 | 419 | ||
425 | MODULE_AUTHOR("Ilya Petrov <ilya.muromec@gmail.com>"); | 420 | MODULE_AUTHOR("Ilya Petrov <ilya.muromec@gmail.com>"); |
426 | MODULE_LICENSE("GPL"); | 421 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index d6ceff93d8b..441dd76f10a 100644 --- a/drivers/staging/nvec/nvec_ps2.c +++ b/drivers/staging/nvec/nvec_ps2.c | |||
@@ -158,12 +158,7 @@ static struct platform_driver nvec_mouse_driver = { | |||
158 | }, | 158 | }, |
159 | }; | 159 | }; |
160 | 160 | ||
161 | static int __init nvec_mouse_init(void) | 161 | module_platform_driver(nvec_mouse_driver); |
162 | { | ||
163 | return platform_driver_register(&nvec_mouse_driver); | ||
164 | } | ||
165 | |||
166 | module_init(nvec_mouse_init); | ||
167 | 162 | ||
168 | MODULE_DESCRIPTION("NVEC mouse driver"); | 163 | MODULE_DESCRIPTION("NVEC mouse driver"); |
169 | MODULE_AUTHOR("Marc Dietrich <marvin24@gmx.de>"); | 164 | MODULE_AUTHOR("Marc Dietrich <marvin24@gmx.de>"); |