Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9c2309 authored by Kim Phillips's avatar Kim Phillips Committed by Paul Mackerras
Browse files

[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class" 

This reverts commit 7a69af63.

As advised by David Brownell:

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



Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6c12c18d

arch/powerpc/kernel/time.c

+0 −42
Original line number Diff line number Diff line
@@ -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

include/asm-powerpc/time.h

+0 −4
Original line number Diff line number Diff line
@@ -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)