diff options
author | Yong Zhang <yong.zhang0@gmail.com> | 2012-03-23 18:02:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:39 -0400 |
commit | 2f6e5f9458646263d3d9ffadd5e11e3d8d15a7d0 (patch) | |
tree | d7c0e867b5de5a5b94c32c2c66a4e22e934918a7 | |
parent | 2778ebcc09c002cccdbd6b5509b5cbf4161b486d (diff) |
drivers/rtc: remove IRQF_DISABLED
Since commit e58aa3d2d0cc ("genirq: run irq handlers with interrupts
disabled") we run all interrupt handlers with interrupts disabled and we
even check and yell when an interrupt handler returns with interrupts
enabled - see commit b738a50a2026 ("genirq: warn when handler enables
interrupts").
So now this flag is a NOOP and can be removed.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Wan ZongShun <mcuos.com@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-at91sam9.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-cmos.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-coh901331.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-davinci.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1511.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-ds1553.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-lpc32xx.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-mpc5121.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-mrst.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-mv.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-nuc900.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-omap.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-pl030.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-pl031.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-pxa.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-s3c.c | 4 | ||||
-rw-r--r-- | drivers/rtc/rtc-sa1100.c | 7 | ||||
-rw-r--r-- | drivers/rtc/rtc-sh.c | 8 | ||||
-rw-r--r-- | drivers/rtc/rtc-stk17ta8.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-tx4939.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-vr41xx.c | 4 |
21 files changed, 31 insertions, 32 deletions
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index ee3c122c0599..274a0aafe42b 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c | |||
@@ -335,7 +335,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) | |||
335 | 335 | ||
336 | /* register irq handler after we know what name we'll use */ | 336 | /* register irq handler after we know what name we'll use */ |
337 | ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, | 337 | ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, |
338 | IRQF_DISABLED | IRQF_SHARED, | 338 | IRQF_SHARED, |
339 | dev_name(&rtc->rtcdev->dev), rtc); | 339 | dev_name(&rtc->rtcdev->dev), rtc); |
340 | if (ret) { | 340 | if (ret) { |
341 | dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS); | 341 | dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS); |
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index d7782aa09943..7d5f56edb8ef 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
@@ -714,7 +714,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) | |||
714 | rtc_cmos_int_handler = cmos_interrupt; | 714 | rtc_cmos_int_handler = cmos_interrupt; |
715 | 715 | ||
716 | retval = request_irq(rtc_irq, rtc_cmos_int_handler, | 716 | retval = request_irq(rtc_irq, rtc_cmos_int_handler, |
717 | IRQF_DISABLED, dev_name(&cmos_rtc.rtc->dev), | 717 | 0, dev_name(&cmos_rtc.rtc->dev), |
718 | cmos_rtc.rtc); | 718 | cmos_rtc.rtc); |
719 | if (retval < 0) { | 719 | if (retval < 0) { |
720 | dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq); | 720 | dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq); |
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 80f9c88214c5..a5b8a0c4ea84 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c | |||
@@ -199,7 +199,7 @@ static int __init coh901331_probe(struct platform_device *pdev) | |||
199 | } | 199 | } |
200 | 200 | ||
201 | rtap->irq = platform_get_irq(pdev, 0); | 201 | rtap->irq = platform_get_irq(pdev, 0); |
202 | if (request_irq(rtap->irq, coh901331_interrupt, IRQF_DISABLED, | 202 | if (request_irq(rtap->irq, coh901331_interrupt, 0, |
203 | "RTC COH 901 331 Alarm", rtap)) { | 203 | "RTC COH 901 331 Alarm", rtap)) { |
204 | ret = -EIO; | 204 | ret = -EIO; |
205 | goto out_no_irq; | 205 | goto out_no_irq; |
diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c index 755e1fe914af..14c2109dbaa3 100644 --- a/drivers/rtc/rtc-davinci.c +++ b/drivers/rtc/rtc-davinci.c | |||
@@ -542,7 +542,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev) | |||
542 | rtcss_write(davinci_rtc, 0, PRTCSS_RTC_CCTRL); | 542 | rtcss_write(davinci_rtc, 0, PRTCSS_RTC_CCTRL); |
543 | 543 | ||
544 | ret = request_irq(davinci_rtc->irq, davinci_rtc_interrupt, | 544 | ret = request_irq(davinci_rtc->irq, davinci_rtc_interrupt, |
545 | IRQF_DISABLED, "davinci_rtc", davinci_rtc); | 545 | 0, "davinci_rtc", davinci_rtc); |
546 | if (ret < 0) { | 546 | if (ret < 0) { |
547 | dev_err(dev, "unable to register davinci RTC interrupt\n"); | 547 | dev_err(dev, "unable to register davinci RTC interrupt\n"); |
548 | goto fail4; | 548 | goto fail4; |
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 761f36bc83a9..1f675f5294f5 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
@@ -532,7 +532,7 @@ ds1511_rtc_probe(struct platform_device *pdev) | |||
532 | if (pdata->irq > 0) { | 532 | if (pdata->irq > 0) { |
533 | rtc_read(RTC_CMD1); | 533 | rtc_read(RTC_CMD1); |
534 | if (devm_request_irq(&pdev->dev, pdata->irq, ds1511_interrupt, | 534 | if (devm_request_irq(&pdev->dev, pdata->irq, ds1511_interrupt, |
535 | IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) { | 535 | IRQF_SHARED, pdev->name, pdev) < 0) { |
536 | 536 | ||
537 | dev_warn(&pdev->dev, "interrupt not available.\n"); | 537 | dev_warn(&pdev->dev, "interrupt not available.\n"); |
538 | pdata->irq = 0; | 538 | pdata->irq = 0; |
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index 6f0a1b530f2e..6ccedbbf923c 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
@@ -320,7 +320,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev) | |||
320 | writeb(0, ioaddr + RTC_INTERRUPTS); | 320 | writeb(0, ioaddr + RTC_INTERRUPTS); |
321 | if (devm_request_irq(&pdev->dev, pdata->irq, | 321 | if (devm_request_irq(&pdev->dev, pdata->irq, |
322 | ds1553_rtc_interrupt, | 322 | ds1553_rtc_interrupt, |
323 | IRQF_DISABLED, pdev->name, pdev) < 0) { | 323 | 0, pdev->name, pdev) < 0) { |
324 | dev_warn(&pdev->dev, "interrupt not available.\n"); | 324 | dev_warn(&pdev->dev, "interrupt not available.\n"); |
325 | pdata->irq = 0; | 325 | pdata->irq = 0; |
326 | } | 326 | } |
diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c index ecc1713b2b4f..63c72189c64b 100644 --- a/drivers/rtc/rtc-lpc32xx.c +++ b/drivers/rtc/rtc-lpc32xx.c | |||
@@ -287,7 +287,7 @@ static int __devinit lpc32xx_rtc_probe(struct platform_device *pdev) | |||
287 | if (rtc->irq >= 0) { | 287 | if (rtc->irq >= 0) { |
288 | if (devm_request_irq(&pdev->dev, rtc->irq, | 288 | if (devm_request_irq(&pdev->dev, rtc->irq, |
289 | lpc32xx_rtc_alarm_interrupt, | 289 | lpc32xx_rtc_alarm_interrupt, |
290 | IRQF_DISABLED, pdev->name, rtc) < 0) { | 290 | 0, pdev->name, rtc) < 0) { |
291 | dev_warn(&pdev->dev, "Can't request interrupt.\n"); | 291 | dev_warn(&pdev->dev, "Can't request interrupt.\n"); |
292 | rtc->irq = -1; | 292 | rtc->irq = -1; |
293 | } else { | 293 | } else { |
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index 9d3caccfc250..e954a759ba85 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c | |||
@@ -327,7 +327,7 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op) | |||
327 | dev_set_drvdata(&op->dev, rtc); | 327 | dev_set_drvdata(&op->dev, rtc); |
328 | 328 | ||
329 | rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1); | 329 | rtc->irq = irq_of_parse_and_map(op->dev.of_node, 1); |
330 | err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED, | 330 | err = request_irq(rtc->irq, mpc5121_rtc_handler, 0, |
331 | "mpc5121-rtc", &op->dev); | 331 | "mpc5121-rtc", &op->dev); |
332 | if (err) { | 332 | if (err) { |
333 | dev_err(&op->dev, "%s: could not request irq: %i\n", | 333 | dev_err(&op->dev, "%s: could not request irq: %i\n", |
@@ -337,7 +337,7 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op) | |||
337 | 337 | ||
338 | rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0); | 338 | rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0); |
339 | err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd, | 339 | err = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd, |
340 | IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev); | 340 | 0, "mpc5121-rtc_upd", &op->dev); |
341 | if (err) { | 341 | if (err) { |
342 | dev_err(&op->dev, "%s: could not request irq: %i\n", | 342 | dev_err(&op->dev, "%s: could not request irq: %i\n", |
343 | __func__, rtc->irq_periodic); | 343 | __func__, rtc->irq_periodic); |
diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c index 6cd6c7235344..f51719bf4a75 100644 --- a/drivers/rtc/rtc-mrst.c +++ b/drivers/rtc/rtc-mrst.c | |||
@@ -366,7 +366,7 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq) | |||
366 | 366 | ||
367 | if (rtc_irq) { | 367 | if (rtc_irq) { |
368 | retval = request_irq(rtc_irq, mrst_rtc_irq, | 368 | retval = request_irq(rtc_irq, mrst_rtc_irq, |
369 | IRQF_DISABLED, dev_name(&mrst_rtc.rtc->dev), | 369 | 0, dev_name(&mrst_rtc.rtc->dev), |
370 | mrst_rtc.rtc); | 370 | mrst_rtc.rtc); |
371 | if (retval < 0) { | 371 | if (retval < 0) { |
372 | dev_dbg(dev, "IRQ %d is already in use, err %d\n", | 372 | dev_dbg(dev, "IRQ %d is already in use, err %d\n", |
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index 768e2edb9678..1300962486d1 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c | |||
@@ -273,7 +273,7 @@ static int __devinit mv_rtc_probe(struct platform_device *pdev) | |||
273 | if (pdata->irq >= 0) { | 273 | if (pdata->irq >= 0) { |
274 | writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS); | 274 | writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS); |
275 | if (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt, | 275 | if (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt, |
276 | IRQF_DISABLED | IRQF_SHARED, | 276 | IRQF_SHARED, |
277 | pdev->name, pdata) < 0) { | 277 | pdev->name, pdata) < 0) { |
278 | dev_warn(&pdev->dev, "interrupt not available.\n"); | 278 | dev_warn(&pdev->dev, "interrupt not available.\n"); |
279 | pdata->irq = -1; | 279 | pdata->irq = -1; |
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index 781068d62f23..b79010987d1e 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c | |||
@@ -269,7 +269,7 @@ static int __devinit nuc900_rtc_probe(struct platform_device *pdev) | |||
269 | 269 | ||
270 | nuc900_rtc->irq_num = platform_get_irq(pdev, 0); | 270 | nuc900_rtc->irq_num = platform_get_irq(pdev, 0); |
271 | if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt, | 271 | if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt, |
272 | IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) { | 272 | 0, "nuc900rtc", nuc900_rtc)) { |
273 | dev_err(&pdev->dev, "NUC900 RTC request irq failed\n"); | 273 | dev_err(&pdev->dev, "NUC900 RTC request irq failed\n"); |
274 | err = -EBUSY; | 274 | err = -EBUSY; |
275 | goto fail4; | 275 | goto fail4; |
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 7789002bdd5c..0b614e32653d 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
@@ -348,14 +348,14 @@ static int __init omap_rtc_probe(struct platform_device *pdev) | |||
348 | rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); | 348 | rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); |
349 | 349 | ||
350 | /* handle periodic and alarm irqs */ | 350 | /* handle periodic and alarm irqs */ |
351 | if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED, | 351 | if (request_irq(omap_rtc_timer, rtc_irq, 0, |
352 | dev_name(&rtc->dev), rtc)) { | 352 | dev_name(&rtc->dev), rtc)) { |
353 | pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", | 353 | pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", |
354 | pdev->name, omap_rtc_timer); | 354 | pdev->name, omap_rtc_timer); |
355 | goto fail1; | 355 | goto fail1; |
356 | } | 356 | } |
357 | if ((omap_rtc_timer != omap_rtc_alarm) && | 357 | if ((omap_rtc_timer != omap_rtc_alarm) && |
358 | (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED, | 358 | (request_irq(omap_rtc_alarm, rtc_irq, 0, |
359 | dev_name(&rtc->dev), rtc))) { | 359 | dev_name(&rtc->dev), rtc))) { |
360 | pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", | 360 | pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", |
361 | pdev->name, omap_rtc_alarm); | 361 | pdev->name, omap_rtc_alarm); |
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index 02111fee077e..a4a1e534ed42 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c | |||
@@ -123,7 +123,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id) | |||
123 | 123 | ||
124 | amba_set_drvdata(dev, rtc); | 124 | amba_set_drvdata(dev, rtc); |
125 | 125 | ||
126 | ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED, | 126 | ret = request_irq(dev->irq[0], pl030_interrupt, 0, |
127 | "rtc-pl030", rtc); | 127 | "rtc-pl030", rtc); |
128 | if (ret) | 128 | if (ret) |
129 | goto err_irq; | 129 | goto err_irq; |
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index a952c8de1dd7..3a470e291282 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c | |||
@@ -352,7 +352,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id) | |||
352 | } | 352 | } |
353 | 353 | ||
354 | if (request_irq(adev->irq[0], pl031_interrupt, | 354 | if (request_irq(adev->irq[0], pl031_interrupt, |
355 | IRQF_DISABLED, "rtc-pl031", ldata)) { | 355 | 0, "rtc-pl031", ldata)) { |
356 | ret = -EIO; | 356 | ret = -EIO; |
357 | goto out_no_irq; | 357 | goto out_no_irq; |
358 | } | 358 | } |
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index fc9f4991574b..0075c8fd93d8 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c | |||
@@ -174,14 +174,14 @@ static int pxa_rtc_open(struct device *dev) | |||
174 | struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); | 174 | struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); |
175 | int ret; | 175 | int ret; |
176 | 176 | ||
177 | ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, IRQF_DISABLED, | 177 | ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, 0, |
178 | "rtc 1Hz", dev); | 178 | "rtc 1Hz", dev); |
179 | if (ret < 0) { | 179 | if (ret < 0) { |
180 | dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_1Hz, | 180 | dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_1Hz, |
181 | ret); | 181 | ret); |
182 | goto err_irq_1Hz; | 182 | goto err_irq_1Hz; |
183 | } | 183 | } |
184 | ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, IRQF_DISABLED, | 184 | ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, 0, |
185 | "rtc Alrm", dev); | 185 | "rtc Alrm", dev); |
186 | if (ret < 0) { | 186 | if (ret < 0) { |
187 | dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_Alrm, | 187 | dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_Alrm, |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index aef40bd2957b..c543f6f1eec2 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
@@ -543,14 +543,14 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev) | |||
543 | s3c_rtc_setfreq(&pdev->dev, 1); | 543 | s3c_rtc_setfreq(&pdev->dev, 1); |
544 | 544 | ||
545 | ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, | 545 | ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, |
546 | IRQF_DISABLED, "s3c2410-rtc alarm", rtc); | 546 | 0, "s3c2410-rtc alarm", rtc); |
547 | if (ret) { | 547 | if (ret) { |
548 | dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); | 548 | dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); |
549 | goto err_alarm_irq; | 549 | goto err_alarm_irq; |
550 | } | 550 | } |
551 | 551 | ||
552 | ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, | 552 | ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, |
553 | IRQF_DISABLED, "s3c2410-rtc tick", rtc); | 553 | 0, "s3c2410-rtc tick", rtc); |
554 | if (ret) { | 554 | if (ret) { |
555 | dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); | 555 | dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); |
556 | free_irq(s3c_rtc_alarmno, rtc); | 556 | free_irq(s3c_rtc_alarmno, rtc); |
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index cb9a585312cc..fb758db9d0f4 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c | |||
@@ -160,14 +160,13 @@ static int sa1100_rtc_open(struct device *dev) | |||
160 | struct platform_device *plat_dev = to_platform_device(dev); | 160 | struct platform_device *plat_dev = to_platform_device(dev); |
161 | struct rtc_device *rtc = platform_get_drvdata(plat_dev); | 161 | struct rtc_device *rtc = platform_get_drvdata(plat_dev); |
162 | 162 | ||
163 | ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, | 163 | ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev); |
164 | "rtc 1Hz", dev); | ||
165 | if (ret) { | 164 | if (ret) { |
166 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); | 165 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); |
167 | goto fail_ui; | 166 | goto fail_ui; |
168 | } | 167 | } |
169 | ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED, | 168 | ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0, |
170 | "rtc Alrm", dev); | 169 | "rtc Alrm", dev); |
171 | if (ret) { | 170 | if (ret) { |
172 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); | 171 | dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); |
173 | goto fail_ai; | 172 | goto fail_ai; |
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 6ac55fd48413..e55a7635ae5f 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
@@ -666,7 +666,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev) | |||
666 | if (rtc->carry_irq <= 0) { | 666 | if (rtc->carry_irq <= 0) { |
667 | /* register shared periodic/carry/alarm irq */ | 667 | /* register shared periodic/carry/alarm irq */ |
668 | ret = request_irq(rtc->periodic_irq, sh_rtc_shared, | 668 | ret = request_irq(rtc->periodic_irq, sh_rtc_shared, |
669 | IRQF_DISABLED, "sh-rtc", rtc); | 669 | 0, "sh-rtc", rtc); |
670 | if (unlikely(ret)) { | 670 | if (unlikely(ret)) { |
671 | dev_err(&pdev->dev, | 671 | dev_err(&pdev->dev, |
672 | "request IRQ failed with %d, IRQ %d\n", ret, | 672 | "request IRQ failed with %d, IRQ %d\n", ret, |
@@ -676,7 +676,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev) | |||
676 | } else { | 676 | } else { |
677 | /* register periodic/carry/alarm irqs */ | 677 | /* register periodic/carry/alarm irqs */ |
678 | ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, | 678 | ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, |
679 | IRQF_DISABLED, "sh-rtc period", rtc); | 679 | 0, "sh-rtc period", rtc); |
680 | if (unlikely(ret)) { | 680 | if (unlikely(ret)) { |
681 | dev_err(&pdev->dev, | 681 | dev_err(&pdev->dev, |
682 | "request period IRQ failed with %d, IRQ %d\n", | 682 | "request period IRQ failed with %d, IRQ %d\n", |
@@ -685,7 +685,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev) | |||
685 | } | 685 | } |
686 | 686 | ||
687 | ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, | 687 | ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, |
688 | IRQF_DISABLED, "sh-rtc carry", rtc); | 688 | 0, "sh-rtc carry", rtc); |
689 | if (unlikely(ret)) { | 689 | if (unlikely(ret)) { |
690 | dev_err(&pdev->dev, | 690 | dev_err(&pdev->dev, |
691 | "request carry IRQ failed with %d, IRQ %d\n", | 691 | "request carry IRQ failed with %d, IRQ %d\n", |
@@ -695,7 +695,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev) | |||
695 | } | 695 | } |
696 | 696 | ||
697 | ret = request_irq(rtc->alarm_irq, sh_rtc_alarm, | 697 | ret = request_irq(rtc->alarm_irq, sh_rtc_alarm, |
698 | IRQF_DISABLED, "sh-rtc alarm", rtc); | 698 | 0, "sh-rtc alarm", rtc); |
699 | if (unlikely(ret)) { | 699 | if (unlikely(ret)) { |
700 | dev_err(&pdev->dev, | 700 | dev_err(&pdev->dev, |
701 | "request alarm IRQ failed with %d, IRQ %d\n", | 701 | "request alarm IRQ failed with %d, IRQ %d\n", |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 7621116bd20d..279f5cfa691a 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
@@ -329,7 +329,7 @@ static int __devinit stk17ta8_rtc_probe(struct platform_device *pdev) | |||
329 | writeb(0, ioaddr + RTC_INTERRUPTS); | 329 | writeb(0, ioaddr + RTC_INTERRUPTS); |
330 | if (devm_request_irq(&pdev->dev, pdata->irq, | 330 | if (devm_request_irq(&pdev->dev, pdata->irq, |
331 | stk17ta8_rtc_interrupt, | 331 | stk17ta8_rtc_interrupt, |
332 | IRQF_DISABLED | IRQF_SHARED, | 332 | IRQF_SHARED, |
333 | pdev->name, pdev) < 0) { | 333 | pdev->name, pdev) < 0) { |
334 | dev_warn(&pdev->dev, "interrupt not available.\n"); | 334 | dev_warn(&pdev->dev, "interrupt not available.\n"); |
335 | pdata->irq = 0; | 335 | pdata->irq = 0; |
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index aac0ffed4345..a12bfac49d36 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c | |||
@@ -266,7 +266,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev) | |||
266 | spin_lock_init(&pdata->lock); | 266 | spin_lock_init(&pdata->lock); |
267 | tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP); | 267 | tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP); |
268 | if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt, | 268 | if (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt, |
269 | IRQF_DISABLED, pdev->name, &pdev->dev) < 0) | 269 | 0, pdev->name, &pdev->dev) < 0) |
270 | return -EBUSY; | 270 | return -EBUSY; |
271 | rtc = rtc_device_register(pdev->name, &pdev->dev, | 271 | rtc = rtc_device_register(pdev->name, &pdev->dev, |
272 | &tx4939_rtc_ops, THIS_MODULE); | 272 | &tx4939_rtc_ops, THIS_MODULE); |
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index fcbfdda2993b..5f60a7c6a155 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c | |||
@@ -333,7 +333,7 @@ static int __devinit rtc_probe(struct platform_device *pdev) | |||
333 | goto err_device_unregister; | 333 | goto err_device_unregister; |
334 | } | 334 | } |
335 | 335 | ||
336 | retval = request_irq(aie_irq, elapsedtime_interrupt, IRQF_DISABLED, | 336 | retval = request_irq(aie_irq, elapsedtime_interrupt, 0, |
337 | "elapsed_time", pdev); | 337 | "elapsed_time", pdev); |
338 | if (retval < 0) | 338 | if (retval < 0) |
339 | goto err_device_unregister; | 339 | goto err_device_unregister; |
@@ -342,7 +342,7 @@ static int __devinit rtc_probe(struct platform_device *pdev) | |||
342 | if (pie_irq <= 0) | 342 | if (pie_irq <= 0) |
343 | goto err_free_irq; | 343 | goto err_free_irq; |
344 | 344 | ||
345 | retval = request_irq(pie_irq, rtclong1_interrupt, IRQF_DISABLED, | 345 | retval = request_irq(pie_irq, rtclong1_interrupt, 0, |
346 | "rtclong1", pdev); | 346 | "rtclong1", pdev); |
347 | if (retval < 0) | 347 | if (retval < 0) |
348 | goto err_free_irq; | 348 | goto err_free_irq; |