3 files changed, 10 insertions, 10 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/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index c4a1144c98b0..45ae39d84b69 100644
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -32,11 +32,11 @@
  */
 
 static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {
-        [0 ] {  IRQ_FPGA_MB86943_PCI_INTA },
-        [16] {  IRQ_FPGA_RTL8029_INTA },
-        [17] {  IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },
-        [18] {  IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },
-        [19] {  IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },
+        [0 ] = { IRQ_FPGA_MB86943_PCI_INTA },
+        [16] = { IRQ_FPGA_RTL8029_INTA },
+        [17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },
+        [18] = { IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },
+        [19] = { IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },
 };
 
 void __init pcibios_irq_init(void)
diff --git a/include/asm-frv/highmem.h b/include/asm-frv/highmem.h
index cfbf7d3a1feb..e2247c22a638 100644
--- a/include/asm-frv/highmem.h
+++ b/include/asm-frv/highmem.h
@@ -134,7 +134,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 
         default:
                 BUG();
-                return 0;
+                return NULL;
         }
 }