Commit ea87cd7a authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] cpqphp_nvram iomem annotations

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fc396d72
...@@ -141,7 +141,7 @@ static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail) ...@@ -141,7 +141,7 @@ static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail)
* *
* returns 0 for non-Compaq ROM, 1 for Compaq ROM * returns 0 for non-Compaq ROM, 1 for Compaq ROM
*/ */
static int check_for_compaq_ROM (void *rom_start) static int check_for_compaq_ROM (void __iomem *rom_start)
{ {
u8 temp1, temp2, temp3, temp4, temp5, temp6; u8 temp1, temp2, temp3, temp4, temp5, temp6;
int result = 0; int result = 0;
...@@ -197,7 +197,7 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size) ...@@ -197,7 +197,7 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
* *
* Read the hot plug Resource Table from NVRAM * Read the hot plug Resource Table from NVRAM
*/ */
static int load_HRT (void *rom_start) static int load_HRT (void __iomem *rom_start)
{ {
u32 available; u32 available;
u32 temp_dword; u32 temp_dword;
...@@ -231,7 +231,7 @@ static int load_HRT (void *rom_start) ...@@ -231,7 +231,7 @@ static int load_HRT (void *rom_start)
* *
* Save the hot plug Resource Table in NVRAM * Save the hot plug Resource Table in NVRAM
*/ */
static u32 store_HRT (void *rom_start) static u32 store_HRT (void __iomem *rom_start)
{ {
u32 *buffer; u32 *buffer;
u32 *pFill; u32 *pFill;
...@@ -423,7 +423,7 @@ static u32 store_HRT (void *rom_start) ...@@ -423,7 +423,7 @@ static u32 store_HRT (void *rom_start)
} }
void compaq_nvram_init (void *rom_start) void compaq_nvram_init (void __iomem *rom_start)
{ {
if (rom_start) { if (rom_start) {
compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR); compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
...@@ -435,7 +435,7 @@ void compaq_nvram_init (void *rom_start) ...@@ -435,7 +435,7 @@ void compaq_nvram_init (void *rom_start)
} }
int compaq_nvram_load (void *rom_start, struct controller *ctrl) int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
{ {
u8 bus, device, function; u8 bus, device, function;
u8 nummem, numpmem, numio, numbus; u8 nummem, numpmem, numio, numbus;
...@@ -648,7 +648,7 @@ int compaq_nvram_load (void *rom_start, struct controller *ctrl) ...@@ -648,7 +648,7 @@ int compaq_nvram_load (void *rom_start, struct controller *ctrl)
} }
int compaq_nvram_store (void *rom_start) int compaq_nvram_store (void __iomem *rom_start)
{ {
int rc = 1; int rc = 1;
......
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