leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] mv64x60 iomem annotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro 2005-09-29 00:34:30 +01:00 committed by Linus Torvalds
parent 9fcdfcd905
commit a7625d6e49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ppc/syslib/mv64x60.c
View File

@ -34,7 +34,7 @@ u8 mv64x60_pci_exclude_bridge = 1;
DEFINE_SPINLOCK(mv64x60_lock); DEFINE_SPINLOCK(mv64x60_lock);
static phys_addr_t mv64x60_bridge_pbase; static phys_addr_t mv64x60_bridge_pbase;
static void *mv64x60_bridge_vbase; static void __iomem *mv64x60_bridge_vbase;
static u32 mv64x60_bridge_type = MV64x60_TYPE_INVALID; static u32 mv64x60_bridge_type = MV64x60_TYPE_INVALID;
static u32 mv64x60_bridge_rev; static u32 mv64x60_bridge_rev;
#if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260) #if defined(CONFIG_SYSFS) && !defined(CONFIG_GT64260)
@ -938,7 +938,7 @@ mv64x60_setup_for_chip(struct mv64x60_handle *bh)
* *
* Return the virtual address of the bridge's registers. * Return the virtual address of the bridge's registers.
*/ */
void * void __iomem *
mv64x60_get_bridge_vbase(void) mv64x60_get_bridge_vbase(void)
{ {
return mv64x60_bridge_vbase; return mv64x60_bridge_vbase;

4
include/asm-ppc/mv64x60.h
View File

@ -233,7 +233,7 @@ struct mv64x60_chip_info {
struct mv64x60_handle { struct mv64x60_handle {
u32 type; /* type of bridge */ u32 type; /* type of bridge */
u32 rev; /* revision of bridge */ u32 rev; /* revision of bridge */
void *v_base; /* virtual base addr of bridge regs */ void __iomem *v_base;/* virtual base addr of bridge regs */
phys_addr_t p_base; /* physical base addr of bridge regs */ phys_addr_t p_base; /* physical base addr of bridge regs */
u32 pci_mode_a; /* pci 0 mode: conventional pci, pci-x*/ u32 pci_mode_a; /* pci 0 mode: conventional pci, pci-x*/
@ -303,7 +303,7 @@ void mv64x60_alloc_hose(struct mv64x60_handle *bh, u32 cfg_addr,
u32 cfg_data, struct pci_controller **hose); u32 cfg_data, struct pci_controller **hose);
int mv64x60_get_type(struct mv64x60_handle *bh); int mv64x60_get_type(struct mv64x60_handle *bh);
int mv64x60_setup_for_chip(struct mv64x60_handle *bh); int mv64x60_setup_for_chip(struct mv64x60_handle *bh);
void *mv64x60_get_bridge_vbase(void); void __iomem *mv64x60_get_bridge_vbase(void);
u32 mv64x60_get_bridge_type(void); u32 mv64x60_get_bridge_type(void);
u32 mv64x60_get_bridge_rev(void); u32 mv64x60_get_bridge_rev(void);
void mv64x60_get_mem_windows(struct mv64x60_handle *bh, void mv64x60_get_mem_windows(struct mv64x60_handle *bh,