diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-13 22:45:48 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-12-13 22:48:21 +0100 |
| commit | 96c8f06a0fb359a9a89701a7afab6d837e466ab0 (patch) | |
| tree | 038d92c31b95abfd5ab83428ab965de82548c4c9 /drivers/rtc/class.c | |
| parent | 042620a018afcfba1d678062b62e463b9e43a68d (diff) | |
| download | linux-stable-96c8f06a0fb359a9a89701a7afab6d837e466ab0.tar.gz linux-stable-96c8f06a0fb359a9a89701a7afab6d837e466ab0.tar.bz2 linux-stable-96c8f06a0fb359a9a89701a7afab6d837e466ab0.zip | |
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.c | 6 |
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, /* Init timerqueue */ timerqueue_init_head(&rtc->timerqueue); - INIT_WORK(&rtc->irqwork, rtctimer_do_work); + INIT_WORK(&rtc->irqwork, rtc_timer_do_work); /* Init aie timer */ - rtctimer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc); + rtc_timer_init(&rtc->aie_timer, rtc_aie_update_irq, (void *)rtc); /* Init uie timer */ - rtctimer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc); + rtc_timer_init(&rtc->uie_rtctimer, rtc_uie_update_irq, (void *)rtc); /* Init pie timer */ hrtimer_init(&rtc->pie_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); rtc->pie_timer.function = rtc_pie_update_irq; |