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

Commit b1eb234f authored by Michael Opdenacker's avatar Michael Opdenacker Committed by Brian Norris
Browse files

mtd: nand: remove deprecated IRQF_DISABLED 



This patch proposes to remove the use of the IRQF_DISABLED flag

It's a NOOP since 2.6.35 and it will be removed one day.

Signed-off-by: default avatarMichael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent cb85b7e7

drivers/mtd/nand/mxc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,7 @@ static int mxcnd_probe(struct platform_device *pdev) 
	host->devtype_data->irq_control(host, 0);



	err = devm_request_irq(&pdev->dev, host->irq, mxc_nfc_irq,

			IRQF_DISABLED, DRIVER_NAME, host);

			0, DRIVER_NAME, host);

	if (err)

		return err;

drivers/mtd/nand/pxa3xx_nand.c

+1 −2
Original line number Diff line number Diff line
@@ -1213,8 +1213,7 @@ static int alloc_nand_resource(struct platform_device *pdev) 
	/* initialize all interrupts to be disabled */

	disable_int(info, NDSR_MASK);



	ret = request_irq(irq, pxa3xx_nand_irq, IRQF_DISABLED,

			  pdev->name, info);

	ret = request_irq(irq, pxa3xx_nand_irq, 0, pdev->name, info);

	if (ret < 0) {

		dev_err(&pdev->dev, "failed to request IRQ\n");

		goto fail_free_buf;

drivers/mtd/nand/tmio_nand.c

+1 −2
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ static int tmio_probe(struct platform_device *dev) 
	/* 15 us command delay time */

	nand_chip->chip_delay = 15;



	retval = request_irq(irq, &tmio_irq,

				IRQF_DISABLED, dev_name(&dev->dev), tmio);

	retval = request_irq(irq, &tmio_irq, 0, dev_name(&dev->dev), tmio);

	if (retval) {

		dev_err(&dev->dev, "request_irq error %d\n", retval);

		goto err_irq;