lkml.org 
[lkml]   [2015]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/15] powerpc: use device_initcall for registering rtc devices
    Date
    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>
    Acked-by: 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(-)

    diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
    index 56f44848b044..43922509a483 100644
    --- a/arch/powerpc/kernel/time.c
    +++ b/arch/powerpc/kernel/time.c
    @@ -1124,4 +1124,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 ce73ce865613..791c6142c4a7 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);
    --
    2.2.1


    \
     
     \ /
      Last update: 2015-05-29 03:21    [W:4.608 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site