lkml.org 
[lkml]   [2006]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[POWERPC][PATCH 2/2] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
    This reverts commit 7a69af63e788a324d162201a0b23df41bcf158dd.

    As advised by David Brownell:

    http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2
    ---
    arch/powerpc/kernel/time.c | 42 ------------------------------------------
    include/asm-powerpc/time.h | 6 +-----
    2 files changed, 1 insertions(+), 47 deletions(-)

    diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
    index a1b5e4b..46a24de 100644
    --- a/arch/powerpc/kernel/time.c
    +++ b/arch/powerpc/kernel/time.c
    @@ -1014,48 +1014,6 @@ void __init time_init(void)
    set_dec(tb_ticks_per_jiffy);
    }

    -#ifdef CONFIG_RTC_CLASS
    -static int set_rtc_class_time(struct rtc_time *tm)
    -{
    - int err;
    - struct class_device *class_dev =
    - rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
    -
    - if (class_dev == NULL)
    - return -ENODEV;
    -
    - err = rtc_set_time(class_dev, tm);
    -
    - rtc_class_close(class_dev);
    -
    - return 0;
    -}
    -
    -static void get_rtc_class_time(struct rtc_time *tm)
    -{
    - int err;
    - struct class_device *class_dev =
    - rtc_class_open(CONFIG_RTC_HCTOSYS_DEVICE);
    -
    - if (class_dev == NULL)
    - return;
    -
    - err = rtc_read_time(class_dev, tm);
    -
    - rtc_class_close(class_dev);
    -
    - return;
    -}
    -
    -int __init rtc_class_hookup(void)
    -{
    - ppc_md.get_rtc_time = get_rtc_class_time;
    - ppc_md.set_rtc_time = set_rtc_class_time;
    -
    - return 0;
    -}
    -#endif /* CONFIG_RTC_CLASS */
    -

    #define FEBRUARY 2
    #define STARTOFTIME 1970
    diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
    index a782850..268c623 100644
    --- a/include/asm-powerpc/time.h
    +++ b/include/asm-powerpc/time.h
    @@ -39,10 +39,6 @@ extern void generic_calibrate_decr(void)
    extern void wakeup_decrementer(void);
    extern void snapshot_timebase(void);

    -#ifdef CONFIG_RTC_CLASS
    -extern int __init rtc_class_hookup(void);
    -#endif
    -
    /* Some sane defaults: 125 MHz timebase, 1GHz processor */
    extern unsigned long ppc_proc_freq;
    #define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8)
    --
    1.4.2.3
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-11-20 23:33    [W:0.021 / U:96.768 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site