3 files changed, 6 insertions, 9 deletions

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,