redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] RTC subsystem: ARM Integrator cleanup 

Fix some namespace conflicts between the RTC subsystem and the ARM Integrator
time functions.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
hifive-unleashed-5.1
Richard Purdie 2006-03-27 01:16:36 -08:00 committed by Linus Torvalds
parent 12b824fb15
commit 4079c39aaa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-integrator/time.c
View File

@ -40,13 +40,13 @@ static int integrator_set_rtc(void)
return 1; return 1;
} }
static int rtc_read_alarm(struct rtc_wkalrm *alrm) static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm)
{ {
rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time); rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time);
return 0; return 0;
} }
static inline int rtc_set_alarm(struct rtc_wkalrm *alrm) static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm)
{ {
unsigned long time; unsigned long time;
int ret; int ret;
@ -62,7 +62,7 @@ static inline int rtc_set_alarm(struct rtc_wkalrm *alrm)
return ret; return ret;
} }
static int rtc_read_time(struct rtc_time *tm) static int integrator_rtc_read_time(struct rtc_time *tm)
{ {
rtc_time_to_tm(readl(rtc_base + RTC_DR), tm); rtc_time_to_tm(readl(rtc_base + RTC_DR), tm);
return 0; return 0;
@ -76,7 +76,7 @@ static int rtc_read_time(struct rtc_time *tm)
* edge of the 1Hz clock, we must write the time one second * edge of the 1Hz clock, we must write the time one second
* in advance. * in advance.
*/ */
static inline int rtc_set_time(struct rtc_time *tm) static inline int integrator_rtc_set_time(struct rtc_time *tm)
{ {
unsigned long time; unsigned long time;
int ret; int ret;
@ -90,10 +90,10 @@ static inline int rtc_set_time(struct rtc_time *tm)
static struct rtc_ops rtc_ops = { static struct rtc_ops rtc_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.read_time = rtc_read_time, .read_time = integrator_rtc_read_time,
.set_time = rtc_set_time, .set_time = integrator_rtc_set_time,
.read_alarm = rtc_read_alarm, .read_alarm = integrator_rtc_read_alarm,
.set_alarm = rtc_set_alarm, .set_alarm = integrator_rtc_set_alarm,
}; };
static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id, static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,