Re: [PATCH 37/57] mmc: irq: Remove IRQF_DISABLED

From: Guennadi Liakhovetski
Date: Wed Sep 21 2011 - 06:16:17 EST


On Wed, 21 Sep 2011, Yong Zhang wrote:

> 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>
> ---
> drivers/mmc/host/omap_hsmmc.c | 5 ++---
> drivers/mmc/host/tmio_mmc.c | 4 ++--

For tmio_mmc.c:

Acked-by: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>

Thanks
Guennadi

> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 21e4a79..75c6395 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -2015,7 +2015,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
> }
>
> /* Request IRQ for MMC operations */
> - ret = request_irq(host->irq, omap_hsmmc_irq, IRQF_DISABLED,
> + ret = request_irq(host->irq, omap_hsmmc_irq, 0,
> mmc_hostname(mmc), host);
> if (ret) {
> dev_dbg(mmc_dev(host->mmc), "Unable to grab HSMMC IRQ\n");
> @@ -2043,8 +2043,7 @@ static int __init omap_hsmmc_probe(struct platform_device *pdev)
> if ((mmc_slot(host).card_detect_irq)) {
> ret = request_irq(mmc_slot(host).card_detect_irq,
> omap_hsmmc_cd_handler,
> - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
> - | IRQF_DISABLED,
> + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
> mmc_hostname(mmc), host);
> if (ret) {
> dev_dbg(mmc_dev(host->mmc),
> diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
> index 44a9668..a4ea102 100644
> --- a/drivers/mmc/host/tmio_mmc.c
> +++ b/drivers/mmc/host/tmio_mmc.c
> @@ -88,8 +88,8 @@ static int __devinit tmio_mmc_probe(struct platform_device *pdev)
> if (ret)
> goto cell_disable;
>
> - ret = request_irq(irq, tmio_mmc_irq, IRQF_DISABLED |
> - IRQF_TRIGGER_FALLING, dev_name(&pdev->dev), host);
> + ret = request_irq(irq, tmio_mmc_irq, IRQF_TRIGGER_FALLING,
> + dev_name(&pdev->dev), host);
> if (ret)
> goto host_remove;
>
> --
> 1.7.4.1
>

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/