MIPS: GIC: Remove dependencies from Malta files.

This prevents the GIC code from being reusable sanely. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: GIC: Remove dependencies from Malta files.
This prevents the GIC code from being reusable sanely. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle
1 parent 25f12b339c
Showing 4 changed files with 5 additions and 5 deletions Side-by-side Diff
arch/mips/include/asm/gic.h
arch/mips/include/asm/mips-boards/maltaint.h
arch/mips/kernel/irq-gic.c
arch/mips/mti-malta/malta-int.c
@@ -321,6 +321,7 @@
  */
 struct gic_intr_map {
 	unsigned int cpunum;	/* Directed to this CPU */
+#define GIC_UNUSED		0xdead			/* Dummy data */
 	unsigned int pin;	/* Directed to this Pin */
 	unsigned int polarity;	/* Polarity : +/-	*/
 	unsigned int trigtype;	/* Trigger  : Edge/Levl */
@@ -88,9 +88,6 @@
  
 #define GIC_EXT_INTR(x)		x
  
-/* Dummy data */
-#define X			0xdead
-
 /* External Interrupts used for IPI */
 #define GIC_IPI_EXT_INTR_RESCHED_VPE0	16
 #define GIC_IPI_EXT_INTR_CALLFNC_VPE0	17
@@ -7,7 +7,6 @@
 #include <asm/io.h>
 #include <asm/gic.h>
 #include <asm/gcmpregs.h>
-#include <asm/mips-boards/maltaint.h>
 #include <asm/irq.h>
 #include <linux/hardirq.h>
 #include <asm-generic/bitops/find.h>
@@ -222,7 +221,7 @@
 	/* Setup specifics */
 	for (i = 0; i < mapsize; i++) {
 		cpu = intrmap[i].cpunum;
-		if (cpu == X)
+		if (cpu == GIC_UNUSED)
 			continue;
 		if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
 			continue;
@@ -385,6 +385,8 @@
  */
  
 #define GIC_CPU_NMI GIC_MAP_TO_NMI_MSK
+#define X GIC_UNUSED
+
 static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
 	{ X, X,		   X,		X,		0 },
 	{ X, X,		   X,	 	X,		0 },
@@ -404,6 +406,7 @@
 	{ X, X,		   X,		X,	        0 },
 	/* The remainder of this table is initialised by fill_ipi_map */
 };
+#undef X
  
 /*
  * GCMP needs to be detected before any SMP initialisation
...	...	@@ -321,6 +321,7 @@
321	321	*/
322	322	struct gic_intr_map {
323	323	unsigned int cpunum; /* Directed to this CPU */
	324	+#define GIC_UNUSED 0xdead /* Dummy data */
324	325	unsigned int pin; /* Directed to this Pin */
325	326	unsigned int polarity; /* Polarity : +/- */
326	327	unsigned int trigtype; /* Trigger : Edge/Levl */
...	...	@@ -88,9 +88,6 @@
88	88
89	89	#define GIC_EXT_INTR(x) x
90	90
91		-/* Dummy data */
92		-#define X 0xdead
93		-
94	91	/* External Interrupts used for IPI */
95	92	#define GIC_IPI_EXT_INTR_RESCHED_VPE0 16
96	93	#define GIC_IPI_EXT_INTR_CALLFNC_VPE0 17
...	...	@@ -7,7 +7,6 @@
7	7	#include <asm/io.h>
8	8	#include <asm/gic.h>
9	9	#include <asm/gcmpregs.h>
10		-#include <asm/mips-boards/maltaint.h>
11	10	#include <asm/irq.h>
12	11	#include <linux/hardirq.h>
13	12	#include <asm-generic/bitops/find.h>
...	...	@@ -222,7 +221,7 @@
222	221	/* Setup specifics */
223	222	for (i = 0; i < mapsize; i++) {
224	223	cpu = intrmap[i].cpunum;
225		- if (cpu == X)
	224	+ if (cpu == GIC_UNUSED)
226	225	continue;
227	226	if (cpu == 0 && i != 0 && intrmap[i].flags == 0)
228	227	continue;
...	...	@@ -385,6 +385,8 @@
385	385	*/
386	386
387	387	#define GIC_CPU_NMI GIC_MAP_TO_NMI_MSK
	388	+#define X GIC_UNUSED
	389	+
388	390	static struct gic_intr_map gic_intr_map[GIC_NUM_INTRS] = {
389	391	{ X, X, X, X, 0 },
390	392	{ X, X, X, X, 0 },
...	...	@@ -404,6 +406,7 @@
404	406	{ X, X, X, X, 0 },
405	407	/* The remainder of this table is initialised by fill_ipi_map */
406	408	};
	409	+#undef X
407	410
408	411	/*
409	412	* GCMP needs to be detected before any SMP initialisation