X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=include%2Fasm-mips%2Frtc.h;h=82ad401c7dcae6839d5ea6b0e7181ce6fca84822;hb=225ec70a8cf5086a70d755e394c56186a30053d3;hp=a60e0dc7c9b9406f19efb3e4bf9eb98ddb7b34a0;hpb=ba77df570c6710c9c19b31e0e48e4bcdf31cefe8;p=linux-2.6-microblaze.git diff --git a/include/asm-mips/rtc.h b/include/asm-mips/rtc.h index a60e0dc7c9b9..82ad401c7dca 100644 --- a/include/asm-mips/rtc.h +++ b/include/asm-mips/rtc.h @@ -14,7 +14,6 @@ #ifdef __KERNEL__ -#include #include #include @@ -29,17 +28,13 @@ #define RTC_24H 0x02 /* 24 hour mode - else hours bit 7 means pm */ #define RTC_DST_EN 0x01 /* auto switch DST - works f. USA only */ -static DEFINE_SPINLOCK(mips_rtc_lock); - static inline unsigned int get_rtc_time(struct rtc_time *time) { unsigned long nowtime; - spin_lock(&mips_rtc_lock); - nowtime = rtc_get_time(); + nowtime = rtc_mips_get_time(); to_tm(nowtime, time); time->tm_year -= 1900; - spin_unlock(&mips_rtc_lock); return RTC_24H; } @@ -49,12 +44,10 @@ static inline int set_rtc_time(struct rtc_time *time) unsigned long nowtime; int ret; - spin_lock(&mips_rtc_lock); nowtime = mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec); - ret = rtc_set_time(nowtime); - spin_unlock(&mips_rtc_lock); + ret = rtc_mips_set_time(nowtime); return ret; }