Commit 7c84ace9 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c)


Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f3d2ab41
...@@ -35,17 +35,17 @@ ...@@ -35,17 +35,17 @@
#define CONFIG_OFFSET_VALID(off) ((off) < 4096) #define CONFIG_OFFSET_VALID(off) ((off) < 4096)
static unsigned long pa_pxp_cfg_addr(struct pci_controller *hose, static void volatile __iomem *pa_pxp_cfg_addr(struct pci_controller *hose,
u8 bus, u8 devfn, int offset) u8 bus, u8 devfn, int offset)
{ {
return ((unsigned long)hose->cfg_data) + PA_PXP_CFA(bus, devfn, offset); return hose->cfg_data + PA_PXP_CFA(bus, devfn, offset);
} }
static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn, static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn,
int offset, int len, u32 *val) int offset, int len, u32 *val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
unsigned long addr; void volatile __iomem *addr;
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (!hose) if (!hose)
...@@ -62,13 +62,13 @@ static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn, ...@@ -62,13 +62,13 @@ static int pa_pxp_read_config(struct pci_bus *bus, unsigned int devfn,
*/ */
switch (len) { switch (len) {
case 1: case 1:
*val = in_8((u8 *)addr); *val = in_8(addr);
break; break;
case 2: case 2:
*val = in_le16((u16 *)addr); *val = in_le16(addr);
break; break;
default: default:
*val = in_le32((u32 *)addr); *val = in_le32(addr);
break; break;
} }
...@@ -79,7 +79,7 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -79,7 +79,7 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn,
int offset, int len, u32 val) int offset, int len, u32 val)
{ {
struct pci_controller *hose; struct pci_controller *hose;
unsigned long addr; void volatile __iomem *addr;
hose = pci_bus_to_host(bus); hose = pci_bus_to_host(bus);
if (!hose) if (!hose)
...@@ -96,16 +96,16 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn, ...@@ -96,16 +96,16 @@ static int pa_pxp_write_config(struct pci_bus *bus, unsigned int devfn,
*/ */
switch (len) { switch (len) {
case 1: case 1:
out_8((u8 *)addr, val); out_8(addr, val);
(void) in_8((u8 *)addr); (void) in_8(addr);
break; break;
case 2: case 2:
out_le16((u16 *)addr, val); out_le16(addr, val);
(void) in_le16((u16 *)addr); (void) in_le16(addr);
break; break;
default: default:
out_le32((u32 *)addr, val); out_le32(addr, val);
(void) in_le32((u32 *)addr); (void) in_le32(addr);
break; break;
} }
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment