From b2bdc3e7130001804f27e7c1254930143119f435 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 2 Feb 2009 23:04:42 +0000 Subject: [PATCH] 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 --- drivers/leds/leds-gpio.c | 58 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 25 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,20 +270,41 @@ static struct of_platform_driver of_gpio_leds_driver = { .probe = of_gpio_leds_probe, .remove = __devexit_p(of_gpio_leds_remove), }; - -static int __init of_gpio_leds_init(void) -{ - return of_register_platform_driver(&of_gpio_leds_driver); -} -module_init(of_gpio_leds_init); - -static void __exit of_gpio_leds_exit(void) -{ - of_unregister_platform_driver(&of_gpio_leds_driver); -} -module_exit(of_gpio_leds_exit); #endif +static int __init gpio_led_init(void) +{ + 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; +} + +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); +#endif +} + +module_init(gpio_led_init); +module_exit(gpio_led_exit); + MODULE_AUTHOR("Raphael Assenat , Trent Piepho "); MODULE_DESCRIPTION("GPIO LED driver"); MODULE_LICENSE("GPL");