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: Bryan Wu <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Jacek Anaszewski <[email protected]>
Cc: [email protected]
Signed-off-by: Paul Gortmaker <[email protected]>
---
[
To be appended to the branch content originally sent as:
"Replace module_init with device_initcall in non modules"
https://lkml.kernel.org/r/[email protected]
]
drivers/leds/leds-cobalt-raq.c | 15 +--------------
1 file changed, 1 insertion(+), 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);
--
2.2.1
Hi Paul,
On 06/16/2015 12:12 AM, Paul Gortmaker wrote:
> 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: Bryan Wu <[email protected]>
> Cc: Richard Purdie <[email protected]>
> Cc: Jacek Anaszewski <[email protected]>
> Cc: [email protected]
> Signed-off-by: Paul Gortmaker <[email protected]>
> ---
> [
> To be appended to the branch content originally sent as:
> "Replace module_init with device_initcall in non modules"
> https://lkml.kernel.org/r/[email protected]
> ]
>
> drivers/leds/leds-cobalt-raq.c | 15 +--------------
> 1 file changed, 1 insertion(+), 14 deletions(-)
Acked-by: Jacek Anaszewski <[email protected]>
--
Best Regards,
Jacek Anaszewski
On Tue, Jun 16, 2015 at 1:23 AM, Jacek Anaszewski
<[email protected]> wrote:
> Hi Paul,
>
>
> On 06/16/2015 12:12 AM, Paul Gortmaker wrote:
>>
>> 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: Bryan Wu <[email protected]>
>> Cc: Richard Purdie <[email protected]>
>> Cc: Jacek Anaszewski <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Paul Gortmaker <[email protected]>
>> ---
>> [
>> To be appended to the branch content originally sent as:
>> "Replace module_init with device_initcall in non modules"
>>
>> https://lkml.kernel.org/r/[email protected]
>> ]
>>
>> drivers/leds/leds-cobalt-raq.c | 15 +--------------
>> 1 file changed, 1 insertion(+), 14 deletions(-)
>
>
> Acked-by: Jacek Anaszewski <[email protected]>
>
Thanks, merged.
-Bryan