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/luan.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/luan.c')
-rw-r--r-- | arch/ppc/platforms/4xx/luan.c | 5 |
1 files changed, 2 insertions, 3 deletions
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, | |||
223 | hose->io_space.end = LUAN_PCIX_UPPER_IO; | 223 | hose->io_space.end = LUAN_PCIX_UPPER_IO; |
224 | hose->mem_space.start = lower_mem; | 224 | hose->mem_space.start = lower_mem; |
225 | hose->mem_space.end = upper_mem; | 225 | hose->mem_space.end = upper_mem; |
226 | isa_io_base = | 226 | hose->io_base_virt = ioremap64(pcix_io_base, PCIX_IO_SIZE); |
227 | (unsigned long)ioremap64(pcix_io_base, PCIX_IO_SIZE); | 227 | isa_io_base = (unsigned long) hose->io_base_virt; |
228 | hose->io_base_virt = (void *)isa_io_base; | ||
229 | 228 | ||
230 | setup_indirect_pci(hose, cfga, cfgd); | 229 | setup_indirect_pci(hose, cfga, cfgd); |
231 | hose->set_cfg_type = 1; | 230 | hose->set_cfg_type = 1; |