iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[POWERPC] Use mktime in timer sysdev

Browse Source 
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: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Johannes Berg 2007-05-03 00:25:42 +10:00 committed by Paul Mackerras
parent ee46a90b59
commit 0c358e7076
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/Kconfig
View File

@ -6,11 +6,6 @@ mainmenu "Linux/PowerPC Kernel Configuration"
source "arch/powerpc/platforms/Kconfig.cputype" source "arch/powerpc/platforms/Kconfig.cputype"
config PPC_PM_NEEDS_RTC_LIB
bool
select RTC_LIB
default y if PM
config PPC32 config PPC32
bool bool
default y if !PPC64 default y if !PPC64

14
arch/powerpc/sysdev/timer.c
View File

@ -24,7 +24,12 @@ static int timer_resume(struct sys_device *dev)
/* get current RTC time and convert to seconds */ /* get current RTC time and convert to seconds */
get_rtc_time(&cur_rtc_tm); 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; 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); WARN_ON(!ppc_md.get_rtc_time);
get_rtc_time(&suspend_rtc_tm); 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; return 0;
} }