diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2015-06-15 15:12:47 -0700 |
---|---|---|
committer | Bryan Wu <cooloney@gmail.com> | 2015-06-22 13:57:09 -0700 |
commit | b83fae0c0c5ea97aad4f762dae99342f94523f42 (patch) | |
tree | a11cdacd3aede68ff5ac3997fbcbd8166fc739ef /drivers/leds/leds-cobalt-raq.c | |
parent | ac69b9038f8214e2a8ee0eb3a113af473a7518e4 (diff) | |
download | linux-stable-b83fae0c0c5ea97aad4f762dae99342f94523f42.tar.gz linux-stable-b83fae0c0c5ea97aad4f762dae99342f94523f42.tar.bz2 linux-stable-b83fae0c0c5ea97aad4f762dae99342f94523f42.zip |
drivers/leds: don't use module_init in non-modular leds-cobalt-raq.c
This file is built for a bool Kconfig variable, and hence this
code is either present or absent. It currently can never be
modular, so using module_init as an alias for __initcall can be
somewhat misleading.
Fix this up now, so that we can relocate module_init from
init.h into module.h in the future. If we don't do this, we'd
have to add module.h to obviously non-modular code, and that
would be a worse thing.
Note that direct use of __initcall is discouraged, vs. one
of the priority categorized subgroups. As __initcall gets
mapped onto device_initcall, our use of device_initcall
directly in this change means that the runtime impact is
zero -- it will remain at level 6 in initcall ordering.
And since it can't be modular, we remove all the __exitcall
stuff related to module_exit() -- it is dead code that won't
ever be executed.
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds@vger.kernel.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Bryan Wu <cooloney@gmail.com>
Diffstat (limited to 'drivers/leds/leds-cobalt-raq.c')
-rw-r--r-- | drivers/leds/leds-cobalt-raq.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/leds/leds-cobalt-raq.c b/drivers/leds/leds-cobalt-raq.c index 06dbe18a2065..b316df4a8c1e 100644 --- a/drivers/leds/leds-cobalt-raq.c +++ b/drivers/leds/leds-cobalt-raq.c @@ -108,20 +108,8 @@ err_null: return retval; } -static int cobalt_raq_led_remove(struct platform_device *pdev) -{ - led_classdev_unregister(&raq_power_off_led); - led_classdev_unregister(&raq_web_led); - - if (led_port) - led_port = NULL; - - return 0; -} - static struct platform_driver cobalt_raq_led_driver = { .probe = cobalt_raq_led_probe, - .remove = cobalt_raq_led_remove, .driver = { .name = "cobalt-raq-leds", }, @@ -131,5 +119,4 @@ static int __init cobalt_raq_led_init(void) { return platform_driver_register(&cobalt_raq_led_driver); } - -module_init(cobalt_raq_led_init); +device_initcall(cobalt_raq_led_init); |