- patches.fixes/patch-2.6.11-rc1: 2.6.11-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / ppc / platforms / prep_pci.c

diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c
index 5dce242..8cd80eb 100644 (file)
--- a/arch/ppc/platforms/prep_pci.c
+++ b/arch/ppc/platforms/prep_pci.c
@@ -627,7 +627,7 @@ prep_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
                 int len, u32 *val)
 {
        struct pci_controller *hose = bus->sysdata;
-       volatile unsigned char *cfg_data;
+       volatile void __iomem *cfg_data;
 
        if (bus->number != 0 || DEVNO(devfn) < MIN_DEVNR
            || DEVNO(devfn) > MAX_DEVNR)
@@ -640,13 +640,13 @@ prep_read_config(struct pci_bus *bus, unsigned int devfn, int offset,
        cfg_data = hose->cfg_data + CFGADDR(devfn) + offset;
        switch (len) {
        case 1:
-               *val = in_8((u8 *)cfg_data);
+               *val = in_8(cfg_data);
                break;
        case 2:
-               *val = in_le16((u16 *)cfg_data);
+               *val = in_le16(cfg_data);
                break;
        default:
-               *val = in_le32((u32 *)cfg_data);
+               *val = in_le32(cfg_data);
                break;
        }
        return PCIBIOS_SUCCESSFUL;
@@ -657,7 +657,7 @@ prep_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                  int len, u32 val)
 {
        struct pci_controller *hose = bus->sysdata;
-       volatile unsigned char *cfg_data;
+       volatile void __iomem *cfg_data;
 
        if (bus->number != 0 || DEVNO(devfn) < MIN_DEVNR
            || DEVNO(devfn) > MAX_DEVNR)
@@ -670,13 +670,13 @@ prep_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
        cfg_data = hose->cfg_data + CFGADDR(devfn) + offset;
        switch (len) {
        case 1:
-               out_8((u8 *)cfg_data, val);
+               out_8(cfg_data, val);
                break;
        case 2:
-               out_le16((u16 *)cfg_data, val);
+               out_le16(cfg_data, val);
                break;
        default:
-               out_le32((u32 *)cfg_data, val);
+               out_le32(cfg_data, val);
                break;
        }
        return PCIBIOS_SUCCESSFUL;