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/platforms/4xx/ebony.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/platforms/4xx/ebony.c')
-rw-r--r-- | arch/ppc/platforms/4xx/ebony.c | 5 |
1 files changed, 2 insertions, 3 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) | |||
210 | hose->io_space.end = EBONY_PCI_UPPER_IO; | 210 | hose->io_space.end = EBONY_PCI_UPPER_IO; |
211 | hose->mem_space.start = EBONY_PCI_LOWER_MEM; | 211 | hose->mem_space.start = EBONY_PCI_LOWER_MEM; |
212 | hose->mem_space.end = EBONY_PCI_UPPER_MEM; | 212 | hose->mem_space.end = EBONY_PCI_UPPER_MEM; |
213 | isa_io_base = | 213 | hose->io_base_virt = ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE); |
214 | (unsigned long)ioremap64(EBONY_PCI_IO_BASE, EBONY_PCI_IO_SIZE); | 214 | isa_io_base = (unsigned long)hose->io_base_virt; |
215 | hose->io_base_virt = (void *)isa_io_base; | ||
216 | 215 | ||
217 | setup_indirect_pci(hose, | 216 | setup_indirect_pci(hose, |
218 | EBONY_PCI_CFGA_PLB32, | 217 | EBONY_PCI_CFGA_PLB32, |