m68k: don't use module_init in non-modular mvme16x/rtc.c code
PATCH 1/1 m68k: don't use module_init in non-modular mvme16x/rtc.c code
The rtc.o is built for obj-y, i.e. always built in. It will 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.
arch/m68k/mvme16x/rtc.c +1 -1
@@ -161,4 +161,4 @@ static int __init rtc_MK48T08_init(void)printk (KERN_INFO "MK48T08 Real Time Clock Driver v%s\n" ,RTC_VERSION );return misc_register (&rtc_dev); } -module_init (rtc_MK48T08_init); +device_initcall (rtc_MK48T08_init);
Signature · 1 line
1.8.5.2
Quoted 15 lines · Paul Gortmaker
The rtc.o is built for obj-y, i.e. always built in. It will never be modular, so using
module_initas an alias for__initcallcan be somewhat misleading.Fix this up now, so that we can relocate
module_initfrominit.hintomodule.hin the future. If we don't do this, we'd have to addmodule.hto obviously non-modular code, and that would be a worse thing.Note that direct use of
__initcallis discouraged, vs. one of the priority categorized subgroups. As__initcallgets mapped ontodevice_initcall, our use ofdevice_initcalldirectly in this change means that the runtime impact is zero -- it will remain at level 6 in initcall ordering.
Quoted 3 lines
Cc Geert Uytterhoeven <[email protected]>Signed-off-by Paul Gortmaker <[email protected]>
Thanks, applied and queued for 3.20.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds