summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-dev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
-rw-r--r--drivers/rtc/rtc-dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 00efe24a6063..215eac68ae2d 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -71,9 +71,9 @@ static void rtc_uie_task(struct work_struct *work)
71 if (num) 71 if (num)
72 rtc_handle_legacy_irq(rtc, num, RTC_UF); 72 rtc_handle_legacy_irq(rtc, num, RTC_UF);
73} 73}
74static void rtc_uie_timer(unsigned long data) 74static void rtc_uie_timer(struct timer_list *t)
75{ 75{
76 struct rtc_device *rtc = (struct rtc_device *)data; 76 struct rtc_device *rtc = from_timer(rtc, t, uie_timer);
77 unsigned long flags; 77 unsigned long flags;
78 78
79 spin_lock_irqsave(&rtc->irq_lock, flags); 79 spin_lock_irqsave(&rtc->irq_lock, flags);
@@ -460,7 +460,7 @@ void rtc_dev_prepare(struct rtc_device *rtc)
460 460
461#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL 461#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
462 INIT_WORK(&rtc->uie_task, rtc_uie_task); 462 INIT_WORK(&rtc->uie_task, rtc_uie_task);
463 setup_timer(&rtc->uie_timer, rtc_uie_timer, (unsigned long)rtc); 463 timer_setup(&rtc->uie_timer, rtc_uie_timer, 0);
464#endif 464#endif
465 465
466 cdev_init(&rtc->char_dev, &rtc_dev_fops); 466 cdev_init(&rtc->char_dev, &rtc_dev_fops);