Skip to contentSkip to conversation

m68k: don't use module_init in non-modular mvme16x/rtc.c code

PATCH Applied Paul Gortmaker 2 participants 2 messages Jan 16, 2014 – Jan 11, 2015 m68k architecture

lore
Share & tools
lore
#0 lore raw

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
index 6ef7a81a3b12..1755e2f7137d 100644
@@ -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
maintainer Applied
#1 lore raw
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_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.

Quoted 3 lines

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