aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-10-13 02:21:32 -0400
committerBrian Norris <computersforpeace@gmail.com>2013-11-07 03:08:56 -0500
commitb1eb234fb38dd1b6fb86969bf8f27348e4ec4c74 (patch)
tree6ba97656aef9bb863270a54c05d5573340aef4fc /drivers/mtd
parentcb85b7e7a0605de2de139d2c293ff10affc8a81c (diff)
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: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/mxc_nand.c2
-rw-r--r--drivers/mtd/nand/pxa3xx_nand.c3
-rw-r--r--drivers/mtd/nand/tmio_nand.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 103775525c53..4edea7f4462f 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1508,7 +1508,7 @@ static int mxcnd_probe(struct platform_device *pdev)
1508 host->devtype_data->irq_control(host, 0); 1508 host->devtype_data->irq_control(host, 0);
1509 1509
1510 err = devm_request_irq(&pdev->dev, host->irq, mxc_nfc_irq, 1510 err = devm_request_irq(&pdev->dev, host->irq, mxc_nfc_irq,
1511 IRQF_DISABLED, DRIVER_NAME, host); 1511 0, DRIVER_NAME, host);
1512 if (err) 1512 if (err)
1513 return err; 1513 return err;
1514 1514
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 64c258ec0170..4cabdc9fda90 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1213,8 +1213,7 @@ static int alloc_nand_resource(struct platform_device *pdev)
1213 /* initialize all interrupts to be disabled */ 1213 /* initialize all interrupts to be disabled */
1214 disable_int(info, NDSR_MASK); 1214 disable_int(info, NDSR_MASK);
1215 1215
1216 ret = request_irq(irq, pxa3xx_nand_irq, IRQF_DISABLED, 1216 ret = request_irq(irq, pxa3xx_nand_irq, 0, pdev->name, info);
1217 pdev->name, info);
1218 if (ret < 0) { 1217 if (ret < 0) {
1219 dev_err(&pdev->dev, "failed to request IRQ\n"); 1218 dev_err(&pdev->dev, "failed to request IRQ\n");
1220 goto fail_free_buf; 1219 goto fail_free_buf;
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index 396530d87ecf..a3747c914d57 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -428,8 +428,7 @@ static int tmio_probe(struct platform_device *dev)
428 /* 15 us command delay time */ 428 /* 15 us command delay time */
429 nand_chip->chip_delay = 15; 429 nand_chip->chip_delay = 15;
430 430
431 retval = request_irq(irq, &tmio_irq, 431 retval = request_irq(irq, &tmio_irq, 0, dev_name(&dev->dev), tmio);
432 IRQF_DISABLED, dev_name(&dev->dev), tmio);
433 if (retval) { 432 if (retval) {
434 dev_err(&dev->dev, "request_irq error %d\n", retval); 433 dev_err(&dev->dev, "request_irq error %d\n", retval);
435 goto err_irq; 434 goto err_irq;