tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] mv64x60 iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Al Viro and committed by Linus Torvalds a7625d6e 9fcdfcd9

+4 -4
unified split
+2 -2
arch/ppc/syslib/mv64x60.c
··· 34 DEFINE_SPINLOCK(mv64x60_lock); 35 36 static phys_addr_t mv64x60_bridge_pbase; 37 - static void *mv64x60_bridge_vbase; 38 static u32 mv64x60_bridge_type = MV64x60_TYPE_INVALID; 39 static u32 mv64x60_bridge_rev; 40 #if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260) ··· 938 * 939 * Return the virtual address of the bridge's registers. 940 */ 941 - void * 942 mv64x60_get_bridge_vbase(void) 943 { 944 return mv64x60_bridge_vbase;
··· 34 DEFINE_SPINLOCK(mv64x60_lock); 35 36 static phys_addr_t mv64x60_bridge_pbase; 37 + static void __iomem *mv64x60_bridge_vbase; 38 static u32 mv64x60_bridge_type = MV64x60_TYPE_INVALID; 39 static u32 mv64x60_bridge_rev; 40 #if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260) ··· 938 * 939 * Return the virtual address of the bridge's registers. 940 */ 941 + void __iomem * 942 mv64x60_get_bridge_vbase(void) 943 { 944 return mv64x60_bridge_vbase;
+2 -2
include/asm-ppc/mv64x60.h
··· 233 struct mv64x60_handle { 234 u32 type; /* type of bridge */ 235 u32 rev; /* revision of bridge */ 236 - void *v_base; /* virtual base addr of bridge regs */ 237 phys_addr_t p_base; /* physical base addr of bridge regs */ 238 239 u32 pci_mode_a; /* pci 0 mode: conventional pci, pci-x*/ ··· 303 u32 cfg_data, struct pci_controller **hose); 304 int mv64x60_get_type(struct mv64x60_handle *bh); 305 int mv64x60_setup_for_chip(struct mv64x60_handle *bh); 306 - void *mv64x60_get_bridge_vbase(void); 307 u32 mv64x60_get_bridge_type(void); 308 u32 mv64x60_get_bridge_rev(void); 309 void mv64x60_get_mem_windows(struct mv64x60_handle *bh,
··· 233 struct mv64x60_handle { 234 u32 type; /* type of bridge */ 235 u32 rev; /* revision of bridge */ 236 + void __iomem *v_base;/* virtual base addr of bridge regs */ 237 phys_addr_t p_base; /* physical base addr of bridge regs */ 238 239 u32 pci_mode_a; /* pci 0 mode: conventional pci, pci-x*/ ··· 303 u32 cfg_data, struct pci_controller **hose); 304 int mv64x60_get_type(struct mv64x60_handle *bh); 305 int mv64x60_setup_for_chip(struct mv64x60_handle *bh); 306 + void __iomem *mv64x60_get_bridge_vbase(void); 307 u32 mv64x60_get_bridge_type(void); 308 u32 mv64x60_get_bridge_rev(void); 309 void mv64x60_get_mem_windows(struct mv64x60_handle *bh,