8 files changed, 19 insertions, 27 deletions

diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 98f94b60204c..47a15306823a 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1432,7 +1432,7 @@ pci_bus_to_hose(int bus)
         return NULL;
 }
 
-void*
+void __iomem *
 pci_bus_io_base(unsigned int bus)
 {
         struct pci_controller *hose;
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index f63bca83e757..55120c317f7d 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -210,9 +210,8 @@ ebony_setup_hose(void)
         hose->io_space.end = EBONY_PCI_UPPER_IO;
         hose->mem_space.start = EBONY_PCI_LOWER_MEM;
         hose->mem_space.end = EBONY_PCI_UPPER_MEM;
-        isa_io_base =
-                (unsigned long)ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE);
-        hose->io_base_virt = (void *)isa_io_base;
+        hose->io_base_virt = ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE);
+        isa_io_base = (unsigned long)hose->io_base_virt;
 
         setup_indirect_pci(hose,
                         EBONY_PCI_CFGA_PLB32,
diff --git a/arch/ppc/platforms/4xx/luan.c b/arch/ppc/platforms/4xx/luan.c
index 1df2339f1f6c..95359f748e7b 100644
--- a/arch/ppc/platforms/4xx/luan.c
+++ b/arch/ppc/platforms/4xx/luan.c
@@ -223,9 +223,8 @@ luan_setup_hose(struct pci_controller *hose,
         hose->io_space.end = LUAN_PCIX_UPPER_IO;
         hose->mem_space.start = lower_mem;
         hose->mem_space.end = upper_mem;
-        isa_io_base =
-                (unsigned long)ioremap64(pcix_io_base, PCIX_IO_SIZE);
-        hose->io_base_virt = (void *)isa_io_base;
+        hose->io_base_virt = ioremap64(pcix_io_base, PCIX_IO_SIZE);
+        isa_io_base = (unsigned long) hose->io_base_virt;
 
         setup_indirect_pci(hose, cfga, cfgd);
         hose->set_cfg_type = 1;
diff --git a/arch/ppc/platforms/4xx/ocotea.c b/arch/ppc/platforms/4xx/ocotea.c
index 28de707434f1..5f82a6bc7046 100644
--- a/arch/ppc/platforms/4xx/ocotea.c
+++ b/arch/ppc/platforms/4xx/ocotea.c
@@ -227,9 +227,8 @@ ocotea_setup_hose(void)
         hose->io_space.end = OCOTEA_PCI_UPPER_IO;
         hose->mem_space.start = OCOTEA_PCI_LOWER_MEM;
         hose->mem_space.end = OCOTEA_PCI_UPPER_MEM;
-        isa_io_base =
-                (unsigned long)ioremap64(OCOTEA_PCI_IO_BASE, OCOTEA_PCI_IO_SIZE);
-        hose->io_base_virt = (void *)isa_io_base;
+        hose->io_base_virt = ioremap64(OCOTEA_PCI_IO_BASE, OCOTEA_PCI_IO_SIZE);
+        isa_io_base = (unsigned long) hose->io_base_virt;
 
         setup_indirect_pci(hose,
                         OCOTEA_PCI_CFGA_PLB32,
diff --git a/arch/ppc/syslib/m8260_pci.c b/arch/ppc/syslib/m8260_pci.c
index bd564fb35ab6..057cc3f8ff37 100644
--- a/arch/ppc/syslib/m8260_pci.c
+++ b/arch/ppc/syslib/m8260_pci.c
@@ -171,10 +171,9 @@ void __init m8260_find_bridges(void)
         m8260_setup_pci(hose);
         hose->pci_mem_offset = MPC826x_PCI_MEM_OFFSET;
 
-        isa_io_base =
-                (unsigned long) ioremap(MPC826x_PCI_IO_BASE,
+        hose->io_base_virt = ioremap(MPC826x_PCI_IO_BASE,
                                         MPC826x_PCI_IO_SIZE);
-        hose->io_base_virt = (void *) isa_io_base;
+        isa_io_base = (unsigned long) hose->io_base_virt;
  
         /* setup resources */
         pci_init_resource(&hose->mem_resources[0],
diff --git a/arch/ppc/syslib/mpc52xx_pci.c b/arch/ppc/syslib/mpc52xx_pci.c
index c723efd954a6..59cf3e8bd1a0 100644
--- a/arch/ppc/syslib/mpc52xx_pci.c
+++ b/arch/ppc/syslib/mpc52xx_pci.c
@@ -205,13 +205,11 @@ mpc52xx_find_bridges(void)
 
         hose->pci_mem_offset = MPC52xx_PCI_MEM_OFFSET;
 
-        isa_io_base =
-                (unsigned long) ioremap(MPC52xx_PCI_IO_BASE,
-                                        MPC52xx_PCI_IO_SIZE);
-        hose->io_base_virt = (void *) isa_io_base;
+        hose->io_base_virt = ioremap(MPC52xx_PCI_IO_BASE, MPC52xx_PCI_IO_SIZE);
+        isa_io_base = (unsigned long) hose->io_base_virt;
 
         hose->cfg_addr = &pci_regs->car;
-        hose->cfg_data = (void __iomem *) isa_io_base;
+        hose->cfg_data = hose->io_base_virt;
 
         /* Setup resources */
         pci_init_resource(&hose->mem_resources[0],
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index 81f1968c3269..152c3ef1312a 100644
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -280,16 +280,14 @@ mpc85xx_setup_hose(void)
         hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO;
         hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE;
 #ifdef CONFIG_85xx_PCI2
-        isa_io_base =
-                (unsigned long) ioremap(MPC85XX_PCI1_IO_BASE,
+        hose_a->io_base_virt =  ioremap(MPC85XX_PCI1_IO_BASE,
                                         MPC85XX_PCI1_IO_SIZE +
                                         MPC85XX_PCI2_IO_SIZE);
 #else
-        isa_io_base =
-                (unsigned long) ioremap(MPC85XX_PCI1_IO_BASE,
+        hose_a->io_base_virt =  ioremap(MPC85XX_PCI1_IO_BASE,
                                         MPC85XX_PCI1_IO_SIZE);
 #endif
-        hose_a->io_base_virt = (void *) isa_io_base;
+        isa_io_base = (unsigned long)hose_a->io_base_virt;
 
         /* setup resources */
         pci_init_resource(&hose_a->mem_resources[0],
@@ -329,8 +327,8 @@ mpc85xx_setup_hose(void)
         hose_b->io_space.start = MPC85XX_PCI2_LOWER_IO;
         hose_b->io_space.end = MPC85XX_PCI2_UPPER_IO;
         hose_b->io_base_phys = MPC85XX_PCI2_IO_BASE;
-        hose_b->io_base_virt = (void *) isa_io_base + MPC85XX_PCI1_IO_SIZE;
-
+        hose_b->io_base_virt = hose_a->io_base_virt + MPC85XX_PCI1_IO_SIZE;
+        
         /* setup resources */
         pci_init_resource(&hose_b->mem_resources[0],
                         MPC85XX_PCI2_LOWER_MEM,
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index 78e9be619f14..ffa423456c2b 100644
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -12,7 +12,7 @@ struct pci_controller;
  * pci_io_base returns the memory address at which you can access
  * the I/O space for PCI bus number `bus' (or NULL on error).
  */
-extern void *pci_bus_io_base(unsigned int bus);
+extern void __iomem *pci_bus_io_base(unsigned int bus);
 extern unsigned long pci_bus_io_base_phys(unsigned int bus);
 extern unsigned long pci_bus_mem_base_phys(unsigned int bus);
 
@@ -48,7 +48,7 @@ struct pci_controller {
         int last_busno;
         int bus_offset;
 
-        void *io_base_virt;
+        void __iomem *io_base_virt;
         unsigned long io_base_phys;
 
         /* Some machines (PReP) have a non 1:1 mapping of