Re: [PATCH 46/57] rtc: irq: Remove IRQF_DISABLED
From: Wan ZongShun
Date: Wed Sep 21 2011 - 05:53:07 EST
2011/9/21 Yong Zhang <yong.zhang0@xxxxxxxxx>:
> Since commit [c58543c8: 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 [b738a50a:
> genirq: Warn when handler enables interrupts]).
>
> So now this flag is a NOOP and can be removed.
>
> Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
> Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx>
thanks, add Andrew in loop.
Acked-by: Wan ZongShun <mcuos.com@xxxxxxxxx>
> ---
> Âdrivers/rtc/rtc-at91sam9.c Â| Â Â2 +-
> Âdrivers/rtc/rtc-cmos.c   Â|  Â2 +-
> Âdrivers/rtc/rtc-coh901331.c | Â Â2 +-
> Âdrivers/rtc/rtc-davinci.c  |  Â2 +-
> Âdrivers/rtc/rtc-ds1511.c  Â|  Â2 +-
> Âdrivers/rtc/rtc-ds1553.c  Â|  Â2 +-
> Âdrivers/rtc/rtc-lpc32xx.c  |  Â2 +-
> Âdrivers/rtc/rtc-mpc5121.c  |  Â4 ++--
> Âdrivers/rtc/rtc-mrst.c   Â|  Â2 +-
> Âdrivers/rtc/rtc-mv.c    Â|  Â2 +-
> Âdrivers/rtc/rtc-nuc900.c  Â|  Â2 +-
> Âdrivers/rtc/rtc-omap.c   Â|  Â4 ++--
> Âdrivers/rtc/rtc-pl030.c   |  Â2 +-
> Âdrivers/rtc/rtc-pl031.c   |  Â2 +-
> Âdrivers/rtc/rtc-puv3.c   Â|  Â4 ++--
> Âdrivers/rtc/rtc-pxa.c    |  Â4 ++--
> Âdrivers/rtc/rtc-s3c.c    |  Â4 ++--
> Âdrivers/rtc/rtc-sa1100.c  Â|  Â4 ++--
> Âdrivers/rtc/rtc-sh.c    Â|  Â8 ++++----
> Âdrivers/rtc/rtc-stk17ta8.c Â| Â Â2 +-
> Âdrivers/rtc/rtc-tx4939.c  Â|  Â2 +-
> Âdrivers/rtc/rtc-vr41xx.c  Â|  Â4 ++--
> Â22 files changed, 32 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
> index a3ad957..0c09e8f 100644
> --- a/drivers/rtc/rtc-at91sam9.c
> +++ b/drivers/rtc/rtc-at91sam9.c
> @@ -331,7 +331,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
>
> Â Â Â Â/* register irq handler after we know what name we'll use */
> Â Â Â Âret = request_irq(AT91_ID_SYS, at91_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED | IRQF_SHARED,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_SHARED,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âdev_name(&rtc->rtcdev->dev), rtc);
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Â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 05beb6c..66d3b14 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)
> Â Â Â Â Â Â Â Â Â Â Â Ârtc_cmos_int_handler = cmos_interrupt;
>
> Â Â Â Â Â Â Â Âretval = request_irq(rtc_irq, rtc_cmos_int_handler,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, dev_name(&cmos_rtc.rtc->dev),
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, dev_name(&cmos_rtc.rtc->dev),
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âcmos_rtc.rtc);
> Â Â Â Â Â Â Â Âif (retval < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Â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 80f9c88..a5b8a0c 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)
> Â Â Â Â}
>
> Â Â Â Ârtap->irq = platform_get_irq(pdev, 0);
> - Â Â Â if (request_irq(rtap->irq, coh901331_interrupt, IRQF_DISABLED,
> + Â Â Â if (request_irq(rtap->irq, coh901331_interrupt, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â"RTC COH 901 331 Alarm", rtap)) {
> Â Â Â Â Â Â Â Âret = -EIO;
> Â Â Â Â Â Â Â Âgoto out_no_irq;
> diff --git a/drivers/rtc/rtc-davinci.c b/drivers/rtc/rtc-davinci.c
> index 755e1fe..14c2109 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)
> Â Â Â Ârtcss_write(davinci_rtc, 0, PRTCSS_RTC_CCTRL);
>
> Â Â Â Âret = request_irq(davinci_rtc->irq, davinci_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "davinci_rtc", davinci_rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â 0, "davinci_rtc", davinci_rtc);
> Â Â Â Âif (ret < 0) {
> Â Â Â Â Â Â Â Âdev_err(dev, "unable to register davinci RTC interrupt\n");
> Â Â Â Â Â Â Â Âgoto fail4;
> diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
> index 586c244..bbc7c86 100644
> --- a/drivers/rtc/rtc-ds1511.c
> +++ b/drivers/rtc/rtc-ds1511.c
> @@ -532,7 +532,7 @@ ds1511_rtc_probe(struct platform_device *pdev)
> Â Â Â Âif (pdata->irq > 0) {
> Â Â Â Â Â Â Â Ârtc_read(RTC_CMD1);
> Â Â Â Â Â Â Â Âif (devm_request_irq(&pdev->dev, pdata->irq, ds1511_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) {
> + Â Â Â Â Â Â Â Â Â Â Â IRQF_SHARED, pdev->name, pdev) < 0) {
>
> Â Â Â Â Â Â Â Â Â Â Â Âdev_warn(&pdev->dev, "interrupt not available.\n");
> Â Â Â Â Â Â Â Â Â Â Â Âpdata->irq = 0;
> diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
> index 1350029..1ef2718 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)
> Â Â Â Â Â Â Â Âwriteb(0, ioaddr + RTC_INTERRUPTS);
> Â Â Â Â Â Â Â Âif (devm_request_irq(&pdev->dev, pdata->irq,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âds1553_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, pdev->name, pdev) < 0) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, pdev->name, pdev) < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_warn(&pdev->dev, "interrupt not available.\n");
> Â Â Â Â Â Â Â Â Â Â Â Âpdata->irq = 0;
> Â Â Â Â Â Â Â Â}
> diff --git a/drivers/rtc/rtc-lpc32xx.c b/drivers/rtc/rtc-lpc32xx.c
> index ae16250..ba11a19 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)
> Â Â Â Âif (rtc->irq >= 0) {
> Â Â Â Â Â Â Â Âif (devm_request_irq(&pdev->dev, rtc->irq,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â lpc32xx_rtc_alarm_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_DISABLED, pdev->name, rtc) < 0) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â0, pdev->name, rtc) < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_warn(&pdev->dev, "Can't request interrupt.\n");
> Â Â Â Â Â Â Â Â Â Â Â Ârtc->irq = -1;
> Â Â Â Â Â Â Â Â} else {
> diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
> index da60915..3a683fd 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)
> Â Â Â Âdev_set_drvdata(&op->dev, rtc);
>
> Â Â Â Ârtc->irq = irq_of_parse_and_map(op->dev.of_node, 1);
> - Â Â Â err = request_irq(rtc->irq, mpc5121_rtc_handler, IRQF_DISABLED,
> + Â Â Â err = request_irq(rtc->irq, mpc5121_rtc_handler, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â"mpc5121-rtc", &op->dev);
> Â Â Â Âif (err) {
> Â Â Â Â Â Â Â Â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)
>
> Â Â Â Ârtc->irq_periodic = irq_of_parse_and_map(op->dev.of_node, 0);
> Â Â Â Âerr = request_irq(rtc->irq_periodic, mpc5121_rtc_handler_upd,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "mpc5121-rtc_upd", &op->dev);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "mpc5121-rtc_upd", &op->dev);
> Â Â Â Âif (err) {
> Â Â Â Â Â Â Â Âdev_err(&op->dev, "%s: could not request irq: %i\n",
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â__func__, rtc->irq_periodic);
> diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
> index d335448..507f00e 100644
> --- a/drivers/rtc/rtc-mrst.c
> +++ b/drivers/rtc/rtc-mrst.c
> @@ -363,7 +363,7 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
>
> Â Â Â Âif (rtc_irq) {
> Â Â Â Â Â Â Â Âretval = request_irq(rtc_irq, mrst_rtc_irq,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, dev_name(&mrst_rtc.rtc->dev),
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, dev_name(&mrst_rtc.rtc->dev),
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âmrst_rtc.rtc);
> Â Â Â Â Â Â Â Âif (retval < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Â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 768e2ed..1300962 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)
> Â Â Â Âif (pdata->irq >= 0) {
> Â Â Â Â Â Â Â Âwritel(0, pdata->ioaddr + RTC_ALARM_INTERRUPT_MASK_REG_OFFS);
> Â Â Â Â Â Â Â Âif (devm_request_irq(&pdev->dev, pdata->irq, mv_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_DISABLED | IRQF_SHARED,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_SHARED,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pdev->name, pdata) < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_warn(&pdev->dev, "interrupt not available.\n");
> Â Â Â Â Â Â Â Â Â Â Â Âpdata->irq = -1;
> diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c
> index 781068d..b790109 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)
>
> Â Â Â Ânuc900_rtc->irq_num = platform_get_irq(pdev, 0);
> Â Â Â Âif (request_irq(nuc900_rtc->irq_num, nuc900_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "nuc900rtc", nuc900_rtc)) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "nuc900rtc", nuc900_rtc)) {
> Â Â Â Â Â Â Â Âdev_err(&pdev->dev, "NUC900 RTC request irq failed\n");
> Â Â Â Â Â Â Â Âerr = -EBUSY;
> Â Â Â Â Â Â Â Âgoto fail4;
> diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
> index 7789002..0b614e3 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)
> Â Â Â Â Â Â Â Ârtc_write(OMAP_RTC_STATUS_ALARM, OMAP_RTC_STATUS_REG);
>
> Â Â Â Â/* handle periodic and alarm irqs */
> - Â Â Â if (request_irq(omap_rtc_timer, rtc_irq, IRQF_DISABLED,
> + Â Â Â if (request_irq(omap_rtc_timer, rtc_irq, 0,
> Â Â Â Â Â Â Â Â Â Â Â Âdev_name(&rtc->dev), rtc)) {
> Â Â Â Â Â Â Â Âpr_debug("%s: RTC timer interrupt IRQ%d already claimed\n",
> Â Â Â Â Â Â Â Â Â Â Â Âpdev->name, omap_rtc_timer);
> Â Â Â Â Â Â Â Âgoto fail1;
> Â Â Â Â}
> Â Â Â Âif ((omap_rtc_timer != omap_rtc_alarm) &&
> - Â Â Â Â Â Â Â (request_irq(omap_rtc_alarm, rtc_irq, IRQF_DISABLED,
> + Â Â Â Â Â Â Â (request_irq(omap_rtc_alarm, rtc_irq, 0,
> Â Â Â Â Â Â Â Â Â Â Â Âdev_name(&rtc->dev), rtc))) {
> Â Â Â Â Â Â Â Âpr_debug("%s: RTC alarm interrupt IRQ%d already claimed\n",
> Â Â Â Â Â Â Â Â Â Â Â Âpdev->name, omap_rtc_alarm);
> diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
> index 1d28d44..c5afd6f 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)
>
> Â Â Â Âamba_set_drvdata(dev, rtc);
>
> - Â Â Â ret = request_irq(dev->irq[0], pl030_interrupt, IRQF_DISABLED,
> + Â Â Â ret = request_irq(dev->irq[0], pl030_interrupt, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â"rtc-pl030", rtc);
> Â Â Â Âif (ret)
> Â Â Â Â Â Â Â Âgoto err_irq;
> diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c
> index ff1b84b..d2df59d 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)
> Â Â Â Â}
>
> Â Â Â Âif (request_irq(adev->irq[0], pl031_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "rtc-pl031", ldata)) {
> + Â Â Â Â Â Â Â Â Â Â Â 0, "rtc-pl031", ldata)) {
> Â Â Â Â Â Â Â Âret = -EIO;
> Â Â Â Â Â Â Â Âgoto out_no_irq;
> Â Â Â Â}
> diff --git a/drivers/rtc/rtc-puv3.c b/drivers/rtc/rtc-puv3.c
> index b3eba3c..378fe4b 100644
> --- a/drivers/rtc/rtc-puv3.c
> +++ b/drivers/rtc/rtc-puv3.c
> @@ -164,7 +164,7 @@ static int puv3_rtc_open(struct device *dev)
> Â Â Â Âint ret;
>
> Â Â Â Âret = request_irq(puv3_rtc_alarmno, puv3_rtc_alarmirq,
> - Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, Â"pkunity-rtc alarm", rtc_dev);
> + Â Â Â Â Â Â Â Â Â Â Â Â 0, Â"pkunity-rtc alarm", rtc_dev);
>
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(dev, "IRQ%d error %d\n", puv3_rtc_alarmno, ret);
> @@ -172,7 +172,7 @@ static int puv3_rtc_open(struct device *dev)
> Â Â Â Â}
>
> Â Â Â Âret = request_irq(puv3_rtc_tickno, puv3_rtc_tickirq,
> - Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, Â"pkunity-rtc tick", rtc_dev);
> + Â Â Â Â Â Â Â Â Â Â Â Â 0, Â"pkunity-rtc tick", rtc_dev);
>
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(dev, "IRQ%d error %d\n", puv3_rtc_tickno, ret);
> diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
> index fc9f499..0075c8f 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)
> Â Â Â Âstruct pxa_rtc *pxa_rtc = dev_get_drvdata(dev);
> Â Â Â Âint ret;
>
> - Â Â Â ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, IRQF_DISABLED,
> + Â Â Â ret = request_irq(pxa_rtc->irq_1Hz, pxa_rtc_irq, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â"rtc 1Hz", dev);
> Â Â Â Âif (ret < 0) {
> Â Â Â Â Â Â Â Âdev_err(dev, "can't get irq %i, err %d\n", pxa_rtc->irq_1Hz,
> Â Â Â Â Â Â Â Â Â Â Â Âret);
> Â Â Â Â Â Â Â Âgoto err_irq_1Hz;
> Â Â Â Â}
> - Â Â Â ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, IRQF_DISABLED,
> + Â Â Â ret = request_irq(pxa_rtc->irq_Alrm, pxa_rtc_irq, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â"rtc Alrm", dev);
> Â Â Â Âif (ret < 0) {
> Â Â Â Â Â Â Â Â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 7639ab9..9a073aa 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -536,14 +536,14 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
> Â Â Â Âs3c_rtc_setfreq(&pdev->dev, 1);
>
> Â Â Â Âret = request_irq(s3c_rtc_alarmno, s3c_rtc_alarmirq,
> - Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, Â"s3c2410-rtc alarm", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â 0, Â"s3c2410-rtc alarm", rtc);
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_alarmno, ret);
> Â Â Â Â Â Â Â Âgoto err_alarm_irq;
> Â Â Â Â}
>
> Â Â Â Âret = request_irq(s3c_rtc_tickno, s3c_rtc_tickirq,
> - Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, Â"s3c2410-rtc tick", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â 0, Â"s3c2410-rtc tick", rtc);
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(&pdev->dev, "IRQ%d error %d\n", s3c_rtc_tickno, ret);
> Â Â Â Â Â Â Â Âfree_irq(s3c_rtc_alarmno, rtc);
> diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
> index 0b40bb8..7ca247e 100644
> --- a/drivers/rtc/rtc-sa1100.c
> +++ b/drivers/rtc/rtc-sa1100.c
> @@ -161,13 +161,13 @@ static int sa1100_rtc_open(struct device *dev)
> Â Â Â Âstruct platform_device *plat_dev = to_platform_device(dev);
> Â Â Â Âstruct rtc_device *rtc = platform_get_drvdata(plat_dev);
>
> - Â Â Â ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, IRQF_DISABLED,
> + Â Â Â ret = request_irq(IRQ_RTC1Hz, sa1100_rtc_interrupt, 0,
> Â Â Â Â Â Â Â Â"rtc 1Hz", dev);
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(dev, "IRQ %d already in use.\n", IRQ_RTC1Hz);
> Â Â Â Â Â Â Â Âgoto fail_ui;
> Â Â Â Â}
> - Â Â Â ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, IRQF_DISABLED,
> + Â Â Â ret = request_irq(IRQ_RTCAlrm, sa1100_rtc_interrupt, 0,
> Â Â Â Â Â Â Â Â"rtc Alrm", dev);
> Â Â Â Âif (ret) {
> Â Â Â Â Â Â Â Âdev_err(dev, "IRQ %d already in use.\n", IRQ_RTCAlrm);
> diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
> index 6ac55fd..e55a763 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)
> Â Â Â Âif (rtc->carry_irq <= 0) {
> Â Â Â Â Â Â Â Â/* register shared periodic/carry/alarm irq */
> Â Â Â Â Â Â Â Âret = request_irq(rtc->periodic_irq, sh_rtc_shared,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "sh-rtc", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "sh-rtc", rtc);
> Â Â Â Â Â Â Â Âif (unlikely(ret)) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_err(&pdev->dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â"request IRQ failed with %d, IRQ %d\n", ret,
> @@ -676,7 +676,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
> Â Â Â Â} else {
> Â Â Â Â Â Â Â Â/* register periodic/carry/alarm irqs */
> Â Â Â Â Â Â Â Âret = request_irq(rtc->periodic_irq, sh_rtc_periodic,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "sh-rtc period", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "sh-rtc period", rtc);
> Â Â Â Â Â Â Â Âif (unlikely(ret)) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_err(&pdev->dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â"request period IRQ failed with %d, IRQ %d\n",
> @@ -685,7 +685,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
> Â Â Â Â Â Â Â Â}
>
> Â Â Â Â Â Â Â Âret = request_irq(rtc->carry_irq, sh_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "sh-rtc carry", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "sh-rtc carry", rtc);
> Â Â Â Â Â Â Â Âif (unlikely(ret)) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_err(&pdev->dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â"request carry IRQ failed with %d, IRQ %d\n",
> @@ -695,7 +695,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
> Â Â Â Â Â Â Â Â}
>
> Â Â Â Â Â Â Â Âret = request_irq(rtc->alarm_irq, sh_rtc_alarm,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED, "sh-rtc alarm", rtc);
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â 0, "sh-rtc alarm", rtc);
> Â Â Â Â Â Â Â Âif (unlikely(ret)) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_err(&pdev->dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â"request alarm IRQ failed with %d, IRQ %d\n",
> diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
> index ed3e9b5..5e9adec 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)
> Â Â Â Â Â Â Â Âwriteb(0, ioaddr + RTC_INTERRUPTS);
> Â Â Â Â Â Â Â Âif (devm_request_irq(&pdev->dev, pdata->irq,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âstk17ta8_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_DISABLED | IRQF_SHARED,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â IRQF_SHARED,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âpdev->name, pdev) < 0) {
> Â Â Â Â Â Â Â Â Â Â Â Âdev_warn(&pdev->dev, "interrupt not available.\n");
> Â Â Â Â Â Â Â Â Â Â Â Âpdata->irq = 0;
> diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
> index aac0ffe..a12bfac 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)
> Â Â Â Âspin_lock_init(&pdata->lock);
> Â Â Â Âtx4939_rtc_cmd(pdata->rtcreg, TX4939_RTCCTL_COMMAND_NOP);
> Â Â Â Âif (devm_request_irq(&pdev->dev, irq, tx4939_rtc_interrupt,
> - Â Â Â Â Â Â Â Â Â Â Â Â Â ÂIRQF_DISABLED, pdev->name, &pdev->dev) < 0)
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â0, pdev->name, &pdev->dev) < 0)
> Â Â Â Â Â Â Â Âreturn -EBUSY;
> Â Â Â Ârtc = rtc_device_register(pdev->name, &pdev->dev,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â&tx4939_rtc_ops, THIS_MODULE);
> diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
> index c5698cd..6aef17d 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)
> Â Â Â Â Â Â Â Âgoto err_device_unregister;
> Â Â Â Â}
>
> - Â Â Â retval = request_irq(aie_irq, elapsedtime_interrupt, IRQF_DISABLED,
> + Â Â Â retval = request_irq(aie_irq, elapsedtime_interrupt, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â "elapsed_time", pdev);
> Â Â Â Âif (retval < 0)
> Â Â Â Â Â Â Â Âgoto err_device_unregister;
> @@ -342,7 +342,7 @@ static int __devinit rtc_probe(struct platform_device *pdev)
> Â Â Â Âif (pie_irq <= 0)
> Â Â Â Â Â Â Â Âgoto err_free_irq;
>
> - Â Â Â retval = request_irq(pie_irq, rtclong1_interrupt, IRQF_DISABLED,
> + Â Â Â retval = request_irq(pie_irq, rtclong1_interrupt, 0,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â "rtclong1", pdev);
> Â Â Â Âif (retval < 0)
> Â Â Â Â Â Â Â Âgoto err_free_irq;
> --
> 1.7.4.1
>
>
--
Wan ZongShun.
www.mcuos.com
N§²æìr¸yúèØb²X¬¶ÇvØ^)Þ{.nÇ+·¥{±êçzX§¶¡Ü}©²ÆzÚ&j:+v¨¾«êçzZ+Ê+zf£¢·h§~Ûiÿûàz¹®w¥¢¸?¨èÚ&¢)ßfù^jÇy§m
á@A«a¶Úÿ0¶ìh®åi