aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/pci-bridge.h
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-25 10:55:57 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-25 10:55:57 -0400
commit92a11f9e7cb876e6cf9080e4a1642142cb9221b2 (patch)
treebe7957195d3f013327b45add983e5106356286e0 /include/asm-ppc/pci-bridge.h
parent9090e001f28de4bccae232f1b78e78fad5132ecb (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 'include/asm-ppc/pci-bridge.h')
-rw-r--r--include/asm-ppc/pci-bridge.h4
1 files changed, 2 insertions, 2 deletions
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;
12 * pci_io_base returns the memory address at which you can access 12 * pci_io_base returns the memory address at which you can access
13 * the I/O space for PCI bus number `bus' (or NULL on error). 13 * the I/O space for PCI bus number `bus' (or NULL on error).
14 */ 14 */
15extern void *pci_bus_io_base(unsigned int bus); 15extern void __iomem *pci_bus_io_base(unsigned int bus);
16extern unsigned long pci_bus_io_base_phys(unsigned int bus); 16extern unsigned long pci_bus_io_base_phys(unsigned int bus);
17extern unsigned long pci_bus_mem_base_phys(unsigned int bus); 17extern unsigned long pci_bus_mem_base_phys(unsigned int bus);
18 18
@@ -48,7 +48,7 @@ struct pci_controller {
48 int last_busno; 48 int last_busno;
49 int bus_offset; 49 int bus_offset;
50 50
51 void *io_base_virt; 51 void __iomem *io_base_virt;
52 unsigned long io_base_phys; 52 unsigned long io_base_phys;
53 53
54 /* Some machines (PReP) have a non 1:1 mapping of 54 /* Some machines (PReP) have a non 1:1 mapping of