diff options
author | David Brownell <david-b@pacbell.net> | 2007-05-08 03:33:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:18 -0400 |
commit | ab6a2d70d18edc7a716ef3127b9e13382faec98c (patch) | |
tree | 6de624dfcbd0181e54e21f1730d2a52ae9822c47 /drivers/rtc/rtc-sa1100.c | |
parent | 5726fb2012f0d96153113ddb7f988a0daea587ce (diff) |
rtc: rtc interfaces don't use class_device
This patch removes class_device from the programming interface that the RTC
framework exposes to the rest of the kernel. Now an rtc_device is passed,
which is more type-safe and streamlines all the relevant code.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-By: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 677bae820dc3..0918b787c4dd 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -93,7 +93,7 @@ static irqreturn_t sa1100_rtc_interrupt(int irq, void *dev_id) | |||
93 | if (rtsr & RTSR_HZ) | 93 | if (rtsr & RTSR_HZ) |
94 | events |= RTC_UF | RTC_IRQF; | 94 | events |= RTC_UF | RTC_IRQF; |
95 | 95 | ||
96 | rtc_update_irq(&rtc->class_dev, 1, events); | 96 | rtc_update_irq(rtc, 1, events); |
97 | 97 | ||
98 | if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm)) | 98 | if (rtsr & RTSR_AL && rtc_periodic_alarm(&rtc_alarm)) |
99 | rtc_update_alarm(&rtc_alarm); | 99 | rtc_update_alarm(&rtc_alarm); |
@@ -119,7 +119,7 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id) | |||
119 | */ | 119 | */ |
120 | OSSR = OSSR_M1; /* clear match on timer1 */ | 120 | OSSR = OSSR_M1; /* clear match on timer1 */ |
121 | 121 | ||
122 | rtc_update_irq(&rtc->class_dev, rtc_timer1_count, RTC_PF | RTC_IRQF); | 122 | rtc_update_irq(rtc, rtc_timer1_count, RTC_PF | RTC_IRQF); |
123 | 123 | ||
124 | if (rtc_timer1_count == 1) | 124 | if (rtc_timer1_count == 1) |
125 | rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2))); | 125 | rtc_timer1_count = (rtc_freq * ((1<<30)/(TIMER_FREQ>>2))); |