c9ae111a20
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.12, and Linux v3.13. This work mainly covers: * Finishes work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c) between the PXA family, and the Armada family. * timer initialization update, and access function for the Armada family. * Generic IRQ handling backporting. * Some bug fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39566
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From e3779fc4a84e1c51c061e3e13b1abf1c9a56a2cd Mon Sep 17 00:00:00 2001
|
|
From: Michael Opdenacker <michael.opdenacker@free-electrons.com>
|
|
Date: Sun, 13 Oct 2013 08:21:32 +0200
|
|
Subject: [PATCH 131/203] 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>
|
|
---
|
|
drivers/mtd/nand/pxa3xx_nand.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/pxa3xx_nand.c
|
|
+++ b/drivers/mtd/nand/pxa3xx_nand.c
|
|
@@ -1213,8 +1213,7 @@ static int alloc_nand_resource(struct pl
|
|
/* 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;
|