diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-06 02:31:16 -0400 |
commit | 35f3c5185b1e28e6591aa649db8bf4fa16f1a7f3 (patch) | |
tree | d3057d468d36664d1accf964e76f6d97a299b40d /drivers | |
parent | a700f3594d63a85af196ac64984f7375d903afad (diff) |
sh: Updates for IRQ handler changes.
Trivial fixes for build breakage introduced by IRQ handler changes.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/rtc/rtc-sh.c | 6 | ||||
-rw-r--r-- | drivers/serial/sh-sci.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 8b6efcc05058..143302a8e79c 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -160,7 +160,7 @@ static int sh_rtc_open(struct device *dev) | |||
160 | tmp |= RCR1_CIE; | 160 | tmp |= RCR1_CIE; |
161 | writeb(tmp, rtc->regbase + RCR1); | 161 | writeb(tmp, rtc->regbase + RCR1); |
162 | 162 | ||
163 | ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, SA_INTERRUPT, | 163 | ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, IRQF_DISABLED, |
164 | "sh-rtc period", dev); | 164 | "sh-rtc period", dev); |
165 | if (unlikely(ret)) { | 165 | if (unlikely(ret)) { |
166 | dev_err(dev, "request period IRQ failed with %d, IRQ %d\n", | 166 | dev_err(dev, "request period IRQ failed with %d, IRQ %d\n", |
@@ -168,7 +168,7 @@ static int sh_rtc_open(struct device *dev) | |||
168 | return ret; | 168 | return ret; |
169 | } | 169 | } |
170 | 170 | ||
171 | ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, SA_INTERRUPT, | 171 | ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, IRQF_DISABLED, |
172 | "sh-rtc carry", dev); | 172 | "sh-rtc carry", dev); |
173 | if (unlikely(ret)) { | 173 | if (unlikely(ret)) { |
174 | dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n", | 174 | dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n", |
@@ -177,7 +177,7 @@ static int sh_rtc_open(struct device *dev) | |||
177 | goto err_bad_carry; | 177 | goto err_bad_carry; |
178 | } | 178 | } |
179 | 179 | ||
180 | ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt, SA_INTERRUPT, | 180 | ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt, IRQF_DISABLED, |
181 | "sh-rtc alarm", dev); | 181 | "sh-rtc alarm", dev); |
182 | if (unlikely(ret)) { | 182 | if (unlikely(ret)) { |
183 | dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n", | 183 | dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n", |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 266aa325569e..cfcc3caf49d8 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -808,7 +808,7 @@ static int sci_request_irq(struct sci_port *port) | |||
808 | } | 808 | } |
809 | 809 | ||
810 | if (request_irq(port->irqs[0], sci_mpxed_interrupt, | 810 | if (request_irq(port->irqs[0], sci_mpxed_interrupt, |
811 | SA_INTERRUPT, "sci", port)) { | 811 | IRQF_DISABLED, "sci", port)) { |
812 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); | 812 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); |
813 | return -ENODEV; | 813 | return -ENODEV; |
814 | } | 814 | } |
@@ -817,7 +817,7 @@ static int sci_request_irq(struct sci_port *port) | |||
817 | if (!port->irqs[i]) | 817 | if (!port->irqs[i]) |
818 | continue; | 818 | continue; |
819 | if (request_irq(port->irqs[i], handlers[i], | 819 | if (request_irq(port->irqs[i], handlers[i], |
820 | SA_INTERRUPT, desc[i], port)) { | 820 | IRQF_DISABLED, desc[i], port)) { |
821 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); | 821 | printk(KERN_ERR "sci: Cannot allocate irq.\n"); |
822 | return -ENODEV; | 822 | return -ENODEV; |
823 | } | 823 | } |