diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-02-03 00:04:42 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-04-06 17:06:26 +0200 |
| commit | b2bdc3e7130001804f27e7c1254930143119f435 (patch) | |
| tree | 389a878d3e427bdb424685e87d1eb9f04416b5e2 | |
| parent | leds: Add dac124s085 driver (diff) | |
| download | linux-b2bdc3e7130001804f27e7c1254930143119f435.tar.xz linux-b2bdc3e7130001804f27e7c1254930143119f435.zip | |
leds: Fix leds-gpio driver multiple module_init/exit usage
You can't have multiple module_init()/module_exit calls so resort to messy
ifdefs potentially pending some code refactoring.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | drivers/leds/leds-gpio.c | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index f8bcf98fc15c..0daa2d21cbde 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -178,19 +178,6 @@ static struct platform_driver gpio_led_driver = { }, }; -static int __init gpio_led_init(void) -{ - return platform_driver_register(&gpio_led_driver); -} - -static void __exit gpio_led_exit(void) -{ - platform_driver_unregister(&gpio_led_driver); -} - -module_init(gpio_led_init); -module_exit(gpio_led_exit); - MODULE_ALIAS("platform:leds-gpio"); #endif /* CONFIG_LEDS_GPIO_PLATFORM */ @@ -283,19 +270,40 @@ static struct of_platform_driver of_gpio_leds_driver = { .probe = of_gpio_leds_probe, .remove = __devexit_p(of_gpio_leds_remove), }; +#endif -static int __init of_gpio_leds_init(void) +static int __init gpio_led_init(void) { - return of_register_platform_driver(&of_gpio_leds_driver); + int ret; + +#ifdef CONFIG_LEDS_GPIO_PLATFORM + ret = platform_driver_register(&gpio_led_driver); + if (ret) + return ret; +#endif +#ifdef CONFIG_LEDS_GPIO_OF + ret = of_register_platform_driver(&of_gpio_leds_driver); +#endif +#ifdef CONFIG_LEDS_GPIO_PLATFORM + if (ret) + platform_driver_unregister(&gpio_led_driver); +#endif + + return ret; } -module_init(of_gpio_leds_init); -static void __exit of_gpio_leds_exit(void) +static void __exit gpio_led_exit(void) { +#ifdef CONFIG_LEDS_GPIO_PLATFORM + platform_driver_unregister(&gpio_led_driver); +#endif +#ifdef CONFIG_LEDS_GPIO_OF of_unregister_platform_driver(&of_gpio_leds_driver); -} -module_exit(of_gpio_leds_exit); #endif +} + +module_init(gpio_led_init); +module_exit(gpio_led_exit); MODULE_AUTHOR("Raphael Assenat <raph@8d.com>, Trent Piepho <tpiepho@freescale.com>"); MODULE_DESCRIPTION("GPIO LED driver"); |