Browse Source

[MIPS] Alchemy: Get rid of au1xxx_irq_map_t.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle 17 years ago
parent
commit
0e6799ed07

+ 1 - 1
arch/mips/au1000/common/au1xxx_irqmap.c

@@ -54,7 +54,7 @@
  * Careful if you change match 2 request!
  * Careful if you change match 2 request!
  * The interrupt handler is called directly from the low level dispatch code.
  * The interrupt handler is called directly from the low level dispatch code.
  */
  */
-au1xxx_irq_map_t __initdata au1xxx_ic0_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_ic0_map[] = {
 
 
 #if defined(CONFIG_SOC_AU1000)
 #if defined(CONFIG_SOC_AU1000)
 	{ AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},
 	{ AU1000_UART0_INT, INTC_INT_HIGH_LEVEL, 0},

+ 3 - 3
arch/mips/au1000/common/irq.c

@@ -562,9 +562,9 @@ void __init arch_init_irq(void)
 {
 {
 	int i;
 	int i;
 	unsigned long cp0_status;
 	unsigned long cp0_status;
-	au1xxx_irq_map_t *imp;
-	extern au1xxx_irq_map_t au1xxx_irq_map[];
-	extern au1xxx_irq_map_t au1xxx_ic0_map[];
+	struct au1xxx_irqmap *imp;
+	extern struct au1xxx_irqmap au1xxx_irq_map[];
+	extern struct au1xxx_irqmap au1xxx_ic0_map[];
 	extern int au1xxx_nr_irqs;
 	extern int au1xxx_nr_irqs;
 	extern int au1xxx_ic0_nr_irqs;
 	extern int au1xxx_ic0_nr_irqs;
 
 

+ 1 - 1
arch/mips/au1000/db1x00/irqmap.c

@@ -79,7 +79,7 @@ char irq_tab_alchemy[][5] __initdata = {
 #endif
 #endif
 
 
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 
 
 #ifndef CONFIG_MIPS_MIRAGE
 #ifndef CONFIG_MIPS_MIRAGE
 #ifdef CONFIG_MIPS_DB1550
 #ifdef CONFIG_MIPS_DB1550

+ 1 - 1
arch/mips/au1000/mtx-1/irqmap.c

@@ -58,7 +58,7 @@ char irq_tab_alchemy[][5] __initdata = {
  [7] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 07 - AdapterD-Slot1 (bottom) */
  [7] = { -1, INTD, INTC, INTX, INTX},   /* IDSEL 07 - AdapterD-Slot1 (bottom) */
 };
 };
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
        { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
        { AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },

+ 1 - 1
arch/mips/au1000/pb1000/irqmap.c

@@ -47,7 +47,7 @@
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1000.h>
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1000_GPIO_15, INTC_INT_LOW_LEVEL, 0 },
 };
 };
 
 

+ 1 - 1
arch/mips/au1000/pb1100/irqmap.c

@@ -47,7 +47,7 @@
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/mach-au1x00/au1000.h>
 #include <asm/mach-au1x00/au1000.h>
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted#
 	{ AU1000_GPIO_9, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card Fully_Interted#
 	{ AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG#
 	{ AU1000_GPIO_10, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card STSCHG#
 	{ AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ#
 	{ AU1000_GPIO_11, INTC_INT_LOW_LEVEL, 0 }, // PCMCIA Card IRQ#

+ 1 - 1
arch/mips/au1000/pb1200/irqmap.c

@@ -54,7 +54,7 @@
 #define PB1200_INT_END DB1200_INT_END
 #define PB1200_INT_END DB1200_INT_END
 #endif
 #endif
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
 	{ AU1000_GPIO_7, INTC_INT_LOW_LEVEL, 0 }, // This is exteranl interrupt cascade
 };
 };
 
 

+ 1 - 1
arch/mips/au1000/pb1500/irqmap.c

@@ -52,7 +52,7 @@ char irq_tab_alchemy[][5] __initdata = {
  [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
  [13] = { -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot */
 };
 };
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },

+ 1 - 1
arch/mips/au1000/pb1550/irqmap.c

@@ -52,7 +52,7 @@ char irq_tab_alchemy[][5] __initdata = {
  [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
  [13] =	{ -1, INTA, INTB, INTC, INTD},   /* IDSEL 13 - PCI slot 1 (right) */
 };
 };
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1000_GPIO_0, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1000_GPIO_1, INTC_INT_LOW_LEVEL, 0 },
 };
 };

+ 1 - 1
arch/mips/au1000/xxs1500/irqmap.c

@@ -47,7 +47,7 @@
 #include <asm/system.h>
 #include <asm/system.h>
 #include <asm/au1000.h>
 #include <asm/au1000.h>
 
 
-au1xxx_irq_map_t __initdata au1xxx_irq_map[] = {
+struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
 	{ AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0},
 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_201, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },
 	{ AU1500_GPIO_202, INTC_INT_LOW_LEVEL, 0 },

+ 3 - 3
include/asm-mips/mach-au1x00/au1000.h

@@ -102,16 +102,16 @@ extern unsigned int get_au1x00_lcd_clock(void);
 /*
 /*
  * Every board describes its IRQ mapping with this table.
  * Every board describes its IRQ mapping with this table.
  */
  */
-typedef struct au1xxx_irqmap {
+struct au1xxx_irqmap {
 	int	im_irq;
 	int	im_irq;
 	int	im_type;
 	int	im_type;
 	int	im_request;
 	int	im_request;
-} au1xxx_irq_map_t;
+};
 
 
 /*
 /*
  * init_IRQ looks for a table with this name.
  * init_IRQ looks for a table with this name.
  */
  */
-extern au1xxx_irq_map_t au1xxx_irq_map[];
+extern struct au1xxx_irqmap au1xxx_irq_map[];
 
 
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */
 #endif /* !defined (_LANGUAGE_ASSEMBLY) */