diff options
author | Al Viro <viro@www.linux.org.uk> | 2005-04-25 10:55:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-25 10:55:57 -0400 |
commit | 92a11f9e7cb876e6cf9080e4a1642142cb9221b2 (patch) | |
tree | be7957195d3f013327b45add983e5106356286e0 /arch/ppc/syslib/mpc52xx_pci.c | |
parent | 9090e001f28de4bccae232f1b78e78fad5132ecb (diff) |
[PATCH] ppc iomem annotations: ->io_base_virt
* ->io_base_virt in struct pci_controller is iomem pointer. Marked as such.
Most of the places that used it are already annotated to expect iomem.
* places that did gratitious (and wrong) casts a-la
isa_io_base = (unsigned long)ioremap(...);
hose->io_base_virt = (void *)isa_io_base;
turned into
hose->io_base_virt = ioremap(...);
isa_io_base = (unsigned long)hose->io_base_virt;
* pci_bus_io_base() annotated as returning iomem pointer.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib/mpc52xx_pci.c')
-rw-r--r-- | arch/ppc/syslib/mpc52xx_pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
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) | |||
205 | 205 | ||
206 | hose->pci_mem_offset = MPC52xx_PCI_MEM_OFFSET; | 206 | hose->pci_mem_offset = MPC52xx_PCI_MEM_OFFSET; |
207 | 207 | ||
208 | isa_io_base = | 208 | hose->io_base_virt = ioremap(MPC52xx_PCI_IO_BASE, MPC52xx_PCI_IO_SIZE); |
209 | (unsigned long) ioremap(MPC52xx_PCI_IO_BASE, | 209 | isa_io_base = (unsigned long) hose->io_base_virt; |
210 | MPC52xx_PCI_IO_SIZE); | ||
211 | hose->io_base_virt = (void *) isa_io_base; | ||
212 | 210 | ||
213 | hose->cfg_addr = &pci_regs->car; | 211 | hose->cfg_addr = &pci_regs->car; |
214 | hose->cfg_data = (void __iomem *) isa_io_base; | 212 | hose->cfg_data = hose->io_base_virt; |
215 | 213 | ||
216 | /* Setup resources */ | 214 | /* Setup resources */ |
217 | pci_init_resource(&hose->mem_resources[0], | 215 | pci_init_resource(&hose->mem_resources[0], |