projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[powerpc.git]
/
drivers
/
rtc
/
rtc-sh.c
diff --git
a/drivers/rtc/rtc-sh.c
b/drivers/rtc/rtc-sh.c
index
8b6efcc
..
143302a
100644
(file)
--- a/
drivers/rtc/rtc-sh.c
+++ b/
drivers/rtc/rtc-sh.c
@@
-160,7
+160,7
@@
static int sh_rtc_open(struct device *dev)
tmp |= RCR1_CIE;
writeb(tmp, rtc->regbase + RCR1);
tmp |= RCR1_CIE;
writeb(tmp, rtc->regbase + RCR1);
- ret = request_irq(rtc->periodic_irq, sh_rtc_periodic,
SA_INTERRUPT
,
+ ret = request_irq(rtc->periodic_irq, sh_rtc_periodic,
IRQF_DISABLED
,
"sh-rtc period", dev);
if (unlikely(ret)) {
dev_err(dev, "request period IRQ failed with %d, IRQ %d\n",
"sh-rtc period", dev);
if (unlikely(ret)) {
dev_err(dev, "request period IRQ failed with %d, IRQ %d\n",
@@
-168,7
+168,7
@@
static int sh_rtc_open(struct device *dev)
return ret;
}
return ret;
}
- ret = request_irq(rtc->carry_irq, sh_rtc_interrupt,
SA_INTERRUPT
,
+ ret = request_irq(rtc->carry_irq, sh_rtc_interrupt,
IRQF_DISABLED
,
"sh-rtc carry", dev);
if (unlikely(ret)) {
dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n",
"sh-rtc carry", dev);
if (unlikely(ret)) {
dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n",
@@
-177,7
+177,7
@@
static int sh_rtc_open(struct device *dev)
goto err_bad_carry;
}
goto err_bad_carry;
}
- ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt,
SA_INTERRUPT
,
+ ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt,
IRQF_DISABLED
,
"sh-rtc alarm", dev);
if (unlikely(ret)) {
dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n",
"sh-rtc alarm", dev);
if (unlikely(ret)) {
dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n",