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

Commit 0c358e70 authored by Johannes Berg's avatar Johannes Berg Committed by Paul Mackerras
Browse files

[POWERPC] Use mktime in timer sysdev 



This makes the timer sysdev use mktime instead of rtc_tm_to_time,
since rtc_tm_to_time just calls mktime anyway, and this means we
don't have a dependency on rtc-lib.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ee46a90b

arch/powerpc/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -6,11 +6,6 @@ mainmenu "Linux/PowerPC Kernel Configuration" 


source "arch/powerpc/platforms/Kconfig.cputype"



config PPC_PM_NEEDS_RTC_LIB

	bool

	select RTC_LIB

	default y if PM



config PPC32

	bool

	default y if !PPC64

arch/powerpc/sysdev/timer.c

+12 −2
Original line number Diff line number Diff line
@@ -24,7 +24,12 @@ static int timer_resume(struct sys_device *dev) 


	/* get current RTC time and convert to seconds */

	get_rtc_time(&cur_rtc_tm);

	rtc_tm_to_time(&cur_rtc_tm, &cur_rtc_time);

	cur_rtc_time = mktime(cur_rtc_tm.tm_year + 1900,

			      cur_rtc_tm.tm_mon + 1,

			      cur_rtc_tm.tm_mday,

			      cur_rtc_tm.tm_hour,

			      cur_rtc_tm.tm_min,

			      cur_rtc_tm.tm_sec);



	diff = cur_rtc_time - suspend_rtc_time;
@@ -44,7 +49,12 @@ static int timer_suspend(struct sys_device *dev, pm_message_t state) 
	WARN_ON(!ppc_md.get_rtc_time);



	get_rtc_time(&suspend_rtc_tm);

	rtc_tm_to_time(&suspend_rtc_tm, &suspend_rtc_time);

	suspend_rtc_time = mktime(suspend_rtc_tm.tm_year + 1900,

				  suspend_rtc_tm.tm_mon + 1,

				  suspend_rtc_tm.tm_mday,

				  suspend_rtc_tm.tm_hour,

				  suspend_rtc_tm.tm_min,

				  suspend_rtc_tm.tm_sec);



	return 0;

}