Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9618e9f authored by Yong Zhang's avatar Yong Zhang Committed by Chris Ball
Browse files

mmc: irq: Remove IRQF_DISABLED 



Since commit [e58aa3d2: 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: default avatarYong Zhang <yong.zhang0@gmail.com>
Acked-by: default avatarKishore Kadiyala <kishore.kadiyala@ti.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent f7c56ef2

drivers/mmc/host/omap_hsmmc.c

+2 −3
Original line number Diff line number Diff line
@@ -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),

drivers/mmc/host/tmio_mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -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;