]> err.no Git - linux-2.6/commitdiff
[PATCH] frv: misc sparse annotations
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 23 Jun 2006 09:04:07 +0000 (02:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Jun 2006 14:42:55 +0000 (07:42 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/frv/kernel/irq-routing.c
arch/frv/mb93090-mb00/pci-irq.c
include/asm-frv/highmem.h

index d4776d1f4e82ef4cc6c81c911eccb23eef6e6329..b90b70a761d151ba82527afd05f0de2ab910e169 100644 (file)
@@ -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,        \
        }
index c4a1144c98b0e58db1e5b31d002d0c1caef65ffb..45ae39d84b69a7da6d82d2c0828c64f54859498d 100644 (file)
  */
 
 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)
index cfbf7d3a1feb86262d2b0bd996d0efcaa10d68c0..e2247c22a638aec316a72383d7bc9f77e191dcb6 100644 (file)
@@ -134,7 +134,7 @@ static inline void *kmap_atomic(struct page *page, enum km_type type)
 
        default:
                BUG();
-               return 0;
+               return NULL;
        }
 }