aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc/class.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-12-13 16:45:48 -0500
committerThomas Gleixner <tglx@linutronix.de>2010-12-13 16:48:21 -0500
commit96c8f06a0fb359a9a89701a7afab6d837e466ab0 (patch)
tree038d92c31b95abfd5ab83428ab965de82548c4c9 /drivers/rtc/class.c
parent042620a018afcfba1d678062b62e463b9e43a68d (diff)
rtc: Namespace fixup
rtctimer_* is already occupied by sound/core/rtctimer.c. Instead of fiddling with that, rename the new functions to rtc_timer_* which reads nicer anyway. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'drivers/rtc/class.c')
-rw-r--r--drivers/rtc/class.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 95d2b82762d6..3243832a17cd 100644
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -155,11 +155,11 @@ struct rtc_device *rtc_device_register(const char *name, struct device *dev,
155 155
156 /* Init timerqueue */ 156 /* Init timerqueue */
157 timerqueue_init_head(&rtc->timerqueue); 157 timerqueue_init_head(&rtc->timerqueue);
158 INIT_WORK(&rtc->irqwork, rtctimer_do_work); 158 INIT_WORK(&rtc->irqwork, rtc_timer_do_work);
159 /* Init aie timer */ 159 /* Init aie timer */
160 rtctimer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc); 160 rtc_timer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc);
161 /* Init uie timer */ 161 /* Init uie timer */
162 rtctimer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc); 162 rtc_timer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc);
163 /* Init pie timer */ 163 /* Init pie timer */
164 hrtimer_init(&rtc->pie_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); 164 hrtimer_init(&rtc->pie_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
165 rtc->pie_timer.function = rtc_pie_update_irq; 165 rtc->pie_timer.function = rtc_pie_update_irq;