tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[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>
authored by
Richard Purdie
and committed by
Linus Torvalds
4079c39a
12b824fb
+8
-8
+8
-8
arch/arm/mach-integrator/time.c
+8
-8
arch/arm/mach-integrator/time.c
···
40
40
return 1;
41
41
}
42
42
43
-
static int rtc_read_alarm(struct rtc_wkalrm *alrm)
43
+
static int integrator_rtc_read_alarm(struct rtc_wkalrm *alrm)
44
44
{
45
45
rtc_time_to_tm(readl(rtc_base + RTC_MR), &alrm->time);
46
46
return 0;
47
47
}
48
48
49
-
static inline int rtc_set_alarm(struct rtc_wkalrm *alrm)
49
+
static inline int integrator_rtc_set_alarm(struct rtc_wkalrm *alrm)
50
50
{
51
51
unsigned long time;
52
52
int ret;
···
62
62
return ret;
63
63
}
64
64
65
-
static int rtc_read_time(struct rtc_time *tm)
65
+
static int integrator_rtc_read_time(struct rtc_time *tm)
66
66
{
67
67
rtc_time_to_tm(readl(rtc_base + RTC_DR), tm);
68
68
return 0;
···
76
76
* edge of the 1Hz clock, we must write the time one second
77
77
* in advance.
78
78
*/
79
-
static inline int rtc_set_time(struct rtc_time *tm)
79
+
static inline int integrator_rtc_set_time(struct rtc_time *tm)
80
80
{
81
81
unsigned long time;
82
82
int ret;
···
90
90
91
91
static struct rtc_ops rtc_ops = {
92
92
.owner = THIS_MODULE,
93
-
.read_time = rtc_read_time,
94
-
.set_time = rtc_set_time,
95
-
.read_alarm = rtc_read_alarm,
96
-
.set_alarm = rtc_set_alarm,
93
+
.read_time = integrator_rtc_read_time,
94
+
.set_time = integrator_rtc_set_time,
95
+
.read_alarm = integrator_rtc_read_alarm,
96
+
.set_alarm = integrator_rtc_set_alarm,
97
97
};
98
98
99
99
static irqreturn_t arm_rtc_interrupt(int irq, void *dev_id,