Merge branch 'linus' into x86/cleanups

[linux-2.6] / arch / powerpc / platforms / cell / celleb_scc_pciex.c

diff --git a/arch/powerpc/platforms/cell/celleb_scc_pciex.c b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
index ab24d94baab69bdf5716080def40613b788e6b0c..0e04f8fb152a55a9e5ad0aa9c97bd164738392ea 100644 (file)
--- a/arch/powerpc/platforms/cell/celleb_scc_pciex.c
+++ b/arch/powerpc/platforms/cell/celleb_scc_pciex.c
@@ -36,8 +36,8 @@
 #include "celleb_scc.h"
 #include "celleb_pci.h"
 
-#define PEX_IN(base, off)      in_be32((void *)(base) + (off))
-#define PEX_OUT(base, off, data) out_be32((void *)(base) + (off), (data))
+#define PEX_IN(base, off)      in_be32((void __iomem *)(base) + (off))
+#define PEX_OUT(base, off, data) out_be32((void __iomem *)(base) + (off), (data))
 
 static void scc_pciex_io_flush(struct iowa_bus *bus)
 {
@@ -217,7 +217,7 @@ static u##size scc_pciex_in##name(unsigned long port)                       \
 static void scc_pciex_ins##name(unsigned long p, void *b, unsigned long c) \
 {                                                                      \
        struct iowa_bus *bus = iowa_pio_find_bus(p);                    \
-       u##size *dst = b;                                               \
+       __le##size *dst = b;                                            \
        for (; c != 0; c--, dst++)                                      \
                *dst = cpu_to_le##size(__scc_pciex_in##name(bus->phb, p)); \
        scc_pciex_io_flush(bus);                                        \
@@ -231,10 +231,11 @@ static void scc_pciex_outs##name(unsigned long p, const void *b,  \
                                 unsigned long c)                       \
 {                                                                      \
        struct iowa_bus *bus = iowa_pio_find_bus(p);                    \
-       const u##size *src = b;                                         \
+       const __le##size *src = b;                                      \
        for (; c != 0; c--, src++)                                      \
                __scc_pciex_out##name(bus->phb, le##size##_to_cpu(*src), p); \
 }
+#define __le8 u8
 #define cpu_to_le8(x) (x)
 #define le8_to_cpu(x) (x)
 PCIEX_PIO_FUNC(8, b)
@@ -304,7 +305,7 @@ static int __init scc_pciex_iowa_init(struct iowa_bus *bus, void *data)
        ((((0x1 << (size))-1) << ((addr) & 0x3)) << PEXDCMND_BYTE_EN_SHIFT)
 #define MK_PEXDCMND(cmd, addr, size) ((cmd) | MK_PEXDCMND_BYTE_EN(addr, size))
 
-static uint32_t config_read_pciex_dev(unsigned int *base,
+static uint32_t config_read_pciex_dev(unsigned int __iomem *base,
                uint64_t bus_no, uint64_t dev_no, uint64_t func_no,
                uint64_t off, uint64_t size)
 {
@@ -320,7 +321,7 @@ static uint32_t config_read_pciex_dev(unsigned int *base,
        return ret;
 }
 
-static void config_write_pciex_dev(unsigned int *base, uint64_t bus_no,
+static void config_write_pciex_dev(unsigned int __iomem *base, uint64_t bus_no,
        uint64_t dev_no, uint64_t func_no, uint64_t off, uint64_t size,
        uint32_t data)
 {
@@ -338,7 +339,7 @@ static void config_write_pciex_dev(unsigned int *base, uint64_t bus_no,
        ((((0x1 << (len)) - 1) << ((off) & 0x3)) << PEXCADRS_BYTE_EN_SHIFT)
 #define MK_PEXCADRS(cmd, addr, size) \
        ((cmd) | MK_PEXCADRS_BYTE_EN(addr, size) | ((addr) & ~0x3))
-static uint32_t config_read_pciex_rc(unsigned int *base,
+static uint32_t config_read_pciex_rc(unsigned int __iomem *base,
                                     uint32_t where, uint32_t size)
 {
        PEX_OUT(base, PEXCADRS, MK_PEXCADRS(PEXCADRS_CMD_READ, where, size));
@@ -346,7 +347,7 @@ static uint32_t config_read_pciex_rc(unsigned int *base,
                >> ((where & (4 - size)) * 8)) & ((0x1 << (size * 8)) - 1);
 }
 
-static void config_write_pciex_rc(unsigned int *base, uint32_t where,
+static void config_write_pciex_rc(unsigned int __iomem *base, uint32_t where,
                                  uint32_t size, uint32_t val)
 {
        uint32_t data;
@@ -410,7 +411,7 @@ static struct pci_ops scc_pciex_pci_ops = {
        scc_pciex_write_config,
 };
 
-static void pciex_clear_intr_all(unsigned int *base)
+static void pciex_clear_intr_all(unsigned int __iomem *base)
 {
        PEX_OUT(base, PEXAERRSTS, 0xffffffff);
        PEX_OUT(base, PEXPRERRSTS, 0xffffffff);
@@ -427,7 +428,7 @@ static void pciex_disable_intr_all(unsigned int *base)
 }
 #endif
 
-static void pciex_enable_intr_all(unsigned int *base)
+static void pciex_enable_intr_all(unsigned int __iomem *base)
 {
        PEX_OUT(base, PEXINTMASK, 0x0000e7f1);
        PEX_OUT(base, PEXAERRMASK, 0x03ff01ff);
@@ -435,7 +436,7 @@ static void pciex_enable_intr_all(unsigned int *base)
        PEX_OUT(base, PEXVDMASK, 0x00000001);
 }
 
-static void pciex_check_status(unsigned int *base)
+static void pciex_check_status(unsigned int __iomem *base)
 {
        uint32_t err = 0;
        uint32_t intsts, aerr, prerr, rcvcp, lenerr;