| Message ID | 1390339396-3479-11-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi Paul, On Tue, 2014-01-21 at 16:22 -0500, Paul Gortmaker wrote: > Currently these two RTC devices are in core platform code > where it is not possible for them to be modular. It will > never be modular, so using module_init as an alias for > __initcall can be somewhat misleading. > > arch/powerpc/kernel/time.c | 2 +- > arch/powerpc/platforms/ps3/time.c | 3 +-- > 2 files changed, 2 insertions(+), 3 deletions(-) I tested the PS3 part of this patch and it seems to work OK. Acked-by: Geoff Levand <geoff@infradead.org>
On Tue, Jan 21, 2014 at 6:48 PM, Geoff Levand <geoff@infradead.org> wrote: > Hi Paul, > > On Tue, 2014-01-21 at 16:22 -0500, Paul Gortmaker wrote: >> Currently these two RTC devices are in core platform code >> where it is not possible for them to be modular. It will >> never be modular, so using module_init as an alias for >> __initcall can be somewhat misleading. >> >> arch/powerpc/kernel/time.c | 2 +- >> arch/powerpc/platforms/ps3/time.c | 3 +-- >> 2 files changed, 2 insertions(+), 3 deletions(-) > > I tested the PS3 part of this patch and it seems to work OK. > > Acked-by: Geoff Levand <geoff@infradead.org> Thanks Geoff for the review and testing; I'll add the ack. Paul. -- > > _______________________________________________ > Linuxppc-dev mailing list > Linuxppc-dev@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/linuxppc-dev
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index b3dab20..63b34fc 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -1064,4 +1064,4 @@ static int __init rtc_init(void) return PTR_ERR_OR_ZERO(pdev); } -module_init(rtc_init); +device_initcall(rtc_init); diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c index ce73ce8..791c614 100644 --- a/arch/powerpc/platforms/ps3/time.c +++ b/arch/powerpc/platforms/ps3/time.c @@ -92,5 +92,4 @@ static int __init ps3_rtc_init(void) return PTR_ERR_OR_ZERO(pdev); } - -module_init(ps3_rtc_init); +device_initcall(ps3_rtc_init);
Currently these two RTC devices are in core platform code where it is not possible for them to be modular. 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 -- they will remain at level 6 in initcall ordering. Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Geoff Levand <geoff@infradead.org> Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/powerpc/kernel/time.c | 2 +- arch/powerpc/platforms/ps3/time.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-)