Skip to content

Commit

Permalink
[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to…
Browse files Browse the repository at this point in the history
… new generic rtc class"

This reverts commit 7a69af6.

As advised by David Brownell:

http://marc.theaimsgroup.com/?l=linux-kernel&m=116387226902131&w=2

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Kim Phillips authored and Paul Mackerras committed Nov 22, 2006
1 parent 6c12c18 commit df9c230
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 46 deletions.
42 changes: 0 additions & 42 deletions arch/powerpc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions include/asm-powerpc/time.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit df9c230

Please sign in to comment.