Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Yong Zhang and committed by
Linus Torvalds
2f6e5f94 2778ebcc

+31 -32
+1 -1
drivers/rtc/rtc-at91sam9.c
··· 335 335 336 336 /* register irq handler after we know what name we'll use */ 337 337 ret = request_irq(AT91_ID_SYS, at91_rtc_interrupt, 338 - IRQF_DISABLED | IRQF_SHARED, 338 + IRQF_SHARED, 339 339 dev_name(&rtc->rtcdev->dev), rtc); 340 340 if (ret) { 341 341 dev_dbg(&pdev->dev, "can't share IRQ %d?\n", AT91_ID_SYS);
+1 -1
drivers/rtc/rtc-cmos.c
··· 714 714 rtc_cmos_int_handler = cmos_interrupt; 715 715 716 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 718 cmos_rtc.rtc); 719 719 if (retval < 0) { 720 720 dev_dbg(dev, "IRQ %d is already in use\n", rtc_irq);
+1 -1
drivers/rtc/rtc-coh901331.c
··· 199 199 } 200 200 201 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 203 "RTC COH 901 331 Alarm", rtap)) { 204 204 ret = -EIO; 205 205 goto out_no_irq;
+1 -1
drivers/rtc/rtc-davinci.c
··· 542 542 rtcss_write(davinci_rtc, 0, PRTCSS_RTC_CCTRL); 543 543 544 544 ret = request_irq(davinci_rtc->irq, davinci_rtc_interrupt, 545 - IRQF_DISABLED, "davinci_rtc", davinci_rtc); 545 + 0, "davinci_rtc", davinci_rtc); 546 546 if (ret < 0) { 547 547 dev_err(dev, "unable to register davinci RTC interrupt\n"); 548 548 goto fail4;
+1 -1
drivers/rtc/rtc-ds1511.c
··· 532 532 if (pdata->irq > 0) { 533 533 rtc_read(RTC_CMD1); 534 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 537 dev_warn(&pdev->dev, "interrupt not available.\n"); 538 538 pdata->irq = 0;
+1 -1
drivers/rtc/rtc-ds1553.c
··· 320 320 writeb(0, ioaddr + RTC_INTERRUPTS); 321 321 if (devm_request_irq(&pdev->dev, pdata->irq, 322 322 ds1553_rtc_interrupt, 323 - IRQF_DISABLED, pdev->name, pdev) < 0) { 323 + 0, pdev->name, pdev) < 0) { 324 324 dev_warn(&pdev->dev, "interrupt not available.\n"); 325 325 pdata->irq = 0; 326 326 }
+1 -1
drivers/rtc/rtc-lpc32xx.c
··· 287 287 if (rtc->irq >= 0) { 288 288 if (devm_request_irq(&pdev->dev, rtc->irq, 289 289 lpc32xx_rtc_alarm_interrupt, 290 - IRQF_DISABLED, pdev->name, rtc) < 0) { 290 + 0, pdev->name, rtc) < 0) { 291 291 dev_warn(&pdev->dev, "Can't request interrupt.\n"); 292 292 rtc->irq = -1; 293 293 } else {
+2 -2
drivers/rtc/rtc-mpc5121.c
··· 327 327 dev_set_drvdata(&op->dev, rtc); 328 328 329 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 331 "mpc5121-rtc", &op->dev); 332 332 if (err) { 333 333 dev_err(&op->dev, "%s: could not request irq: %i\n", ··· 337 337 338 338 rtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0); 339 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 341 if (err) { 342 342 dev_err(&op->dev, "%s: could not request irq: %i\n", 343 343 __func__, rtc->irq_periodic);
+1 -1
drivers/rtc/rtc-mrst.c
··· 366 366 367 367 if (rtc_irq) { 368 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 370 mrst_rtc.rtc); 371 371 if (retval < 0) { 372 372 dev_dbg(dev, "IRQ %d is already in use, err %d\n",
+1 -1
drivers/rtc/rtc-mv.c
··· 273 273 if (pdata->irq >= 0) { 274 274 writel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS); 275 275 if (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt, 276 - IRQF_DISABLED | IRQF_SHARED, 276 + IRQF_SHARED, 277 277 pdev->name, pdata) < 0) { 278 278 dev_warn(&pdev->dev, "interrupt not available.\n"); 279 279 pdata->irq = -1;
+1 -1
drivers/rtc/rtc-nuc900.c
··· 269 269 270 270 nuc900_rtc->irq_num = platform_get_irq(pdev, 0); 271 271 if (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt, 272 - IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) { 272 + 0, "nuc900rtc", nuc900_rtc)) { 273 273 dev_err(&pdev->dev, "NUC900 RTC request irq failed\n"); 274 274 err = -EBUSY; 275 275 goto fail4;
+2 -2
drivers/rtc/rtc-omap.c
··· 348 348 rtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG); 349 349 350 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 352 dev_name(&rtc->dev), rtc)) { 353 353 pr_debug("%s: RTC timer interrupt IRQ%d already claimed\n", 354 354 pdev->name, omap_rtc_timer); 355 355 goto fail1; 356 356 } 357 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 359 dev_name(&rtc->dev), rtc))) { 360 360 pr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n", 361 361 pdev->name, omap_rtc_alarm);
+1 -1
drivers/rtc/rtc-pl030.c
··· 123 123 124 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 127 "rtc-pl030", rtc); 128 128 if (ret) 129 129 goto err_irq;
+1 -1
drivers/rtc/rtc-pl031.c
··· 352 352 } 353 353 354 354 if (request_irq(adev->irq[0], pl031_interrupt, 355 - IRQF_DISABLED, "rtc-pl031", ldata)) { 355 + 0, "rtc-pl031", ldata)) { 356 356 ret = -EIO; 357 357 goto out_no_irq; 358 358 }
+2 -2
drivers/rtc/rtc-pxa.c
··· 174 174 struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); 175 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 178 "rtc 1Hz", dev); 179 179 if (ret < 0) { 180 180 dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_1Hz, 181 181 ret); 182 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 185 "rtc Alrm", dev); 186 186 if (ret < 0) { 187 187 dev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_Alrm,
+2 -2
drivers/rtc/rtc-s3c.c
··· 543 543 s3c_rtc_setfreq(&pdev->dev, 1); 544 544 545 545 ret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq, 546 - IRQF_DISABLED, "s3c2410-rtc alarm", rtc); 546 + 0, "s3c2410-rtc alarm", rtc); 547 547 if (ret) { 548 548 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret); 549 549 goto err_alarm_irq; 550 550 } 551 551 552 552 ret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq, 553 - IRQF_DISABLED, "s3c2410-rtc tick", rtc); 553 + 0, "s3c2410-rtc tick", rtc); 554 554 if (ret) { 555 555 dev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret); 556 556 free_irq(s3c_rtc_alarmno, rtc);
+3 -4
drivers/rtc/rtc-sa1100.c
··· 160 160 struct platform_device *plat_dev = to_platform_device(dev); 161 161 struct rtc_device *rtc = platform_get_drvdata(plat_dev); 162 162 163 - ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED, 164 - "rtc 1Hz", dev); 163 + ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0, "rtc 1Hz", dev); 165 164 if (ret) { 166 165 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz); 167 166 goto fail_ui; 168 167 } 169 - ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED, 170 - "rtc Alrm", dev); 168 + ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0, 169 + "rtc Alrm", dev); 171 170 if (ret) { 172 171 dev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm); 173 172 goto fail_ai;
+4 -4
drivers/rtc/rtc-sh.c
··· 666 666 if (rtc->carry_irq <= 0) { 667 667 /* register shared periodic/carry/alarm irq */ 668 668 ret = request_irq(rtc->periodic_irq, sh_rtc_shared, 669 - IRQF_DISABLED, "sh-rtc", rtc); 669 + 0, "sh-rtc", rtc); 670 670 if (unlikely(ret)) { 671 671 dev_err(&pdev->dev, 672 672 "request IRQ failed with %d, IRQ %d\n", ret, ··· 676 676 } else { 677 677 /* register periodic/carry/alarm irqs */ 678 678 ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, 679 - IRQF_DISABLED, "sh-rtc period", rtc); 679 + 0, "sh-rtc period", rtc); 680 680 if (unlikely(ret)) { 681 681 dev_err(&pdev->dev, 682 682 "request period IRQ failed with %d, IRQ %d\n", ··· 685 685 } 686 686 687 687 ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, 688 - IRQF_DISABLED, "sh-rtc carry", rtc); 688 + 0, "sh-rtc carry", rtc); 689 689 if (unlikely(ret)) { 690 690 dev_err(&pdev->dev, 691 691 "request carry IRQ failed with %d, IRQ %d\n", ··· 695 695 } 696 696 697 697 ret = request_irq(rtc->alarm_irq, sh_rtc_alarm, 698 - IRQF_DISABLED, "sh-rtc alarm", rtc); 698 + 0, "sh-rtc alarm", rtc); 699 699 if (unlikely(ret)) { 700 700 dev_err(&pdev->dev, 701 701 "request alarm IRQ failed with %d, IRQ %d\n",
+1 -1
drivers/rtc/rtc-stk17ta8.c
··· 329 329 writeb(0, ioaddr + RTC_INTERRUPTS); 330 330 if (devm_request_irq(&pdev->dev, pdata->irq, 331 331 stk17ta8_rtc_interrupt, 332 - IRQF_DISABLED | IRQF_SHARED, 332 + IRQF_SHARED, 333 333 pdev->name, pdev) < 0) { 334 334 dev_warn(&pdev->dev, "interrupt not available.\n"); 335 335 pdata->irq = 0;
+1 -1
drivers/rtc/rtc-tx4939.c
··· 266 266 spin_lock_init(&pdata->lock); 267 267 tx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP); 268 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 270 return -EBUSY; 271 271 rtc = rtc_device_register(pdev->name, &pdev->dev, 272 272 &tx4939_rtc_ops, THIS_MODULE);
+2 -2
drivers/rtc/rtc-vr41xx.c
··· 333 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 337 "elapsed_time", pdev); 338 338 if (retval < 0) 339 339 goto err_device_unregister; ··· 342 342 if (pie_irq <= 0) 343 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 346 "rtclong1", pdev); 347 347 if (retval < 0) 348 348 goto err_free_irq;