projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22
[powerpc.git]
/
drivers
/
rtc
/
rtc-sh.c
diff --git
a/drivers/rtc/rtc-sh.c
b/drivers/rtc/rtc-sh.c
index
198b9f2
..
e0f91df
100644
(file)
--- a/
drivers/rtc/rtc-sh.c
+++ b/
drivers/rtc/rtc-sh.c
@@
-104,7
+104,7
@@
static irqreturn_t sh_rtc_interrupt(int irq, void *dev_id)
writeb(tmp, rtc->regbase + RCR1);
writeb(tmp, rtc->regbase + RCR1);
- rtc_update_irq(
&rtc->rtc_dev->class
_dev, 1, events);
+ rtc_update_irq(
rtc->rtc
_dev, 1, events);
spin_unlock(&rtc->lock);
spin_unlock(&rtc->lock);
@@
-139,7
+139,7
@@
static irqreturn_t sh_rtc_alarm(int irq, void *dev_id)
rtc->rearm_aie = 1;
rtc->rearm_aie = 1;
- rtc_update_irq(
&rtc->rtc_dev->class
_dev, 1, events);
+ rtc_update_irq(
rtc->rtc
_dev, 1, events);
}
spin_unlock(&rtc->lock);
}
spin_unlock(&rtc->lock);
@@
-153,7
+153,7
@@
static irqreturn_t sh_rtc_periodic(int irq, void *dev_id)
spin_lock(&rtc->lock);
spin_lock(&rtc->lock);
- rtc_update_irq(
&rtc->rtc_dev->class
_dev, 1, RTC_PF | RTC_IRQF);
+ rtc_update_irq(
rtc->rtc
_dev, 1, RTC_PF | RTC_IRQF);
spin_unlock(&rtc->lock);
spin_unlock(&rtc->lock);
@@
-341,7
+341,7
@@
static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm)
tm->tm_sec--;
#endif
tm->tm_sec--;
#endif
- dev_dbg(
&
dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
+ dev_dbg(dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
"mday=%d, mon=%d, year=%d, wday=%d\n",
__FUNCTION__,
tm->tm_sec, tm->tm_min, tm->tm_hour,
"mday=%d, mon=%d, year=%d, wday=%d\n",
__FUNCTION__,
tm->tm_sec, tm->tm_min, tm->tm_hour,