1 files changed, 4 insertions, 4 deletions
diff --git a/arch/frv/kernel/irq-routing.c b/arch/frv/kernel/irq-routing.c
index d4776d1f4e82..b90b70a761d1 100644
--- a/arch/frv/kernel/irq-routing.c
+++ b/arch/frv/kernel/irq-routing.c
@@ -112,7 +112,7 @@ struct irq_source frv_cpuuart[2] = {
 #define __CPUUART(X, A)                                         \
        [X] = {                                                 \
                .muxname        = "uart",                       \
-                .muxdata        = (volatile void __iomem *) A,  \
+                .muxdata        = (volatile void __iomem *)(unsigned long)A,\
                .irqmask        = 1 << IRQ_CPU_UART##X,         \
                .doirq          = frv_cpuuart_doirq,            \
        }
@@ -136,7 +136,7 @@ struct irq_source frv_cpudma[8] = {
 #define __CPUDMA(X, A)                                          \
        [X] = {                                                 \
                .muxname        = "dma",                        \
-                .muxdata        = (volatile void __iomem *) A,  \
+                .muxdata        = (volatile void __iomem *)(unsigned long)A,\
                .irqmask        = 1 << IRQ_CPU_DMA##X,          \
                .doirq          = frv_cpudma_doirq,             \
        }
@@ -164,7 +164,7 @@ struct irq_source frv_cputimer[3] = {
 #define __CPUTIMER(X)                                           \
        [X] = {                                                 \
                .muxname        = "timer",                      \
-                .muxdata        = 0,                            \
+                .muxdata        = NULL,                         \
                .irqmask        = 1 << IRQ_CPU_TIMER##X,        \
                .doirq          = frv_cputimer_doirq,           \
        }
@@ -187,7 +187,7 @@ struct irq_source frv_cpuexternal[8] = {
 #define __CPUEXTERNAL(X)                                        \
        [X] = {                                                 \
                .muxname        = "ext",                        \
-                .muxdata        = 0,                            \
+                .muxdata        = NULL,                         \
                .irqmask        = 1 << IRQ_CPU_EXTERNAL##X,     \
                .doirq          = frv_cpuexternal_doirq,        \
        }

diff --git a/arch/frv/kernel/irq-routing.c b/arch/frv/kernel/irq-routing.c index d4776d1f4e82..b90b70a761d1 100644 --- a/arch/frv/kernel/irq-routing.c +++ b/arch/frv/kernel/irq-routing.c
@@ -112,7 +112,7 @@ struct irq_source frv_cpuuart[2] = {
112	#define __CPUUART(X, A) \	112	#define __CPUUART(X, A) \
113	[X] = { \	113	[X] = { \
114	.muxname = "uart", \	114	.muxname = "uart", \
115	.muxdata = (volatile void __iomem *) A, \	115	.muxdata = (volatile void __iomem *)(unsigned long)A,\
116	.irqmask = 1 << IRQ_CPU_UART##X, \	116	.irqmask = 1 << IRQ_CPU_UART##X, \
117	.doirq = frv_cpuuart_doirq, \	117	.doirq = frv_cpuuart_doirq, \
118	}	118	}
@@ -136,7 +136,7 @@ struct irq_source frv_cpudma[8] = {
136	#define __CPUDMA(X, A) \	136	#define __CPUDMA(X, A) \
137	[X] = { \	137	[X] = { \
138	.muxname = "dma", \	138	.muxname = "dma", \
139	.muxdata = (volatile void __iomem *) A, \	139	.muxdata = (volatile void __iomem *)(unsigned long)A,\
140	.irqmask = 1 << IRQ_CPU_DMA##X, \	140	.irqmask = 1 << IRQ_CPU_DMA##X, \
141	.doirq = frv_cpudma_doirq, \	141	.doirq = frv_cpudma_doirq, \
142	}	142	}
@@ -164,7 +164,7 @@ struct irq_source frv_cputimer[3] = {
164	#define __CPUTIMER(X) \	164	#define __CPUTIMER(X) \
165	[X] = { \	165	[X] = { \
166	.muxname = "timer", \	166	.muxname = "timer", \
167	.muxdata = 0, \	167	.muxdata = NULL, \
168	.irqmask = 1 << IRQ_CPU_TIMER##X, \	168	.irqmask = 1 << IRQ_CPU_TIMER##X, \
169	.doirq = frv_cputimer_doirq, \	169	.doirq = frv_cputimer_doirq, \
170	}	170	}
@@ -187,7 +187,7 @@ struct irq_source frv_cpuexternal[8] = {
187	#define __CPUEXTERNAL(X) \	187	#define __CPUEXTERNAL(X) \
188	[X] = { \	188	[X] = { \
189	.muxname = "ext", \	189	.muxname = "ext", \
190	.muxdata = 0, \	190	.muxdata = NULL, \
191	.irqmask = 1 << IRQ_CPU_EXTERNAL##X, \	191	.irqmask = 1 << IRQ_CPU_EXTERNAL##X, \
192	.doirq = frv_cpuexternal_doirq, \	192	.doirq = frv_cpuexternal_doirq, \
193	}	193	}