IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files.

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>

1 files changed, 16 insertions, 24 deletions

diff --git a/arch/arm/mach-ixp4xx/nslu2-pci.c b/arch/arm/mach-ixp4xx/nslu2-pci.c
index 9665bb082107..1eb5a90470bc 100644
--- a/arch/arm/mach-ixp4xx/nslu2-pci.c
+++ b/arch/arm/mach-ixp4xx/nslu2-pci.c
@@ -21,43 +21,35 @@
 #include <asm/mach/pci.h>
 #include <asm/mach-types.h>
 
-#define NSLU2_PCI_MAX_DEV       3
-#define NSLU2_PCI_IRQ_LINES     3
+#define MAX_DEV         3
+#define IRQ_LINES       3
 
 /* PCI controller GPIO to IRQ pin mappings */
-#define NSLU2_PCI_INTA_PIN      11
-#define NSLU2_PCI_INTB_PIN      10
-#define NSLU2_PCI_INTC_PIN      9
-#define NSLU2_PCI_INTD_PIN      8
-#define IRQ_NSLU2_PCI_INTA      IRQ_IXP4XX_GPIO11
-#define IRQ_NSLU2_PCI_INTB      IRQ_IXP4XX_GPIO10
-#define IRQ_NSLU2_PCI_INTC      IRQ_IXP4XX_GPIO9
+#define INTA            11
+#define INTB            10
+#define INTC            9
+#define INTD            8
 
 void __init nslu2_pci_preinit(void)
 {
-        set_irq_type(IRQ_NSLU2_PCI_INTA, IRQ_TYPE_LEVEL_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTB, IRQ_TYPE_LEVEL_LOW);
-        set_irq_type(IRQ_NSLU2_PCI_INTC, IRQ_TYPE_LEVEL_LOW);
-
+        set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);
+        set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW);
         ixp4xx_pci_preinit();
 }
 
 static int __init nslu2_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
 {
-        static int pci_irq_table[NSLU2_PCI_IRQ_LINES] = {
-                IRQ_NSLU2_PCI_INTA,
-                IRQ_NSLU2_PCI_INTB,
-                IRQ_NSLU2_PCI_INTC,
+        static int pci_irq_table[IRQ_LINES] = {
+                IXP4XX_GPIO_IRQ(INTA),
+                IXP4XX_GPIO_IRQ(INTB),
+                IXP4XX_GPIO_IRQ(INTC),
         };
 
-        int irq = -1;
-
-        if (slot >= 1 && slot <= NSLU2_PCI_MAX_DEV &&
-                pin >= 1 && pin <= NSLU2_PCI_IRQ_LINES) {
-                        irq = pci_irq_table[(slot + pin - 2) % NSLU2_PCI_IRQ_LINES];
-        }
+        if (slot >= 1 && slot <= MAX_DEV && pin >= 1 && pin <= IRQ_LINES)
+                return pci_irq_table[(slot + pin - 2) % IRQ_LINES];
 
-        return irq;
+        return -1;
 }
 
 struct hw_pci __initdata nslu2_pci = {