[PATCH] ibmasm: fix __iomem warnings

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 9b3ff1dcfb7808eddd2fe2c6ef4ce62619b024b7..6fec7fd8cd1aae3d83530aefaa33a83ffc6f51b3 100644 (file)
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -158,7 +158,7 @@ struct remote_queue {
 struct service_processor {
        struct list_head        node;
        spinlock_t              lock;
-       void                    *base_address;
+       void __iomem            *base_address;
        unsigned int            irq;
        struct command          *current_command;
        struct command          *heartbeat;

diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index e604925dff9920fcf4f9693ee51f2f688bad97e6..cdacb25d9a86843c5a6056843290e0598db4a967 100644 (file)
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -520,7 +520,7 @@ static int remote_settings_file_close(struct inode *inode, struct file *file)
 
 static ssize_t remote_settings_file_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
 {
-       unsigned long address = (unsigned long)file->private_data;
+       void __iomem *address = (void __iomem *)file->private_data;
        unsigned char *page;
        int retval;
        int len = 0;
@@ -554,7 +554,7 @@ exit:
 
 static ssize_t remote_settings_file_write(struct file *file, const char __user *ubuff, size_t count, loff_t *offset)
 {
-       unsigned long address = (unsigned long)file->private_data;
+       void __iomem *address = (void __iomem *)file->private_data;
        char *buff;
        unsigned int value;
 

diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c
index 3b3e6314a6c38e67b020d43b2dde1c6b2d0b92c7..5156de2759d864751bc8e9b4dcd12773070957a1 100644 (file)
--- a/drivers/misc/ibmasm/lowlevel.c
+++ b/drivers/misc/ibmasm/lowlevel.c
@@ -58,7 +58,7 @@ irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *reg
 {
        u32     mfa;
        struct service_processor *sp = (struct service_processor *)dev_id;
-       void *base_address = sp->base_address;
+       void __iomem *base_address = sp->base_address;
 
        if (!sp_interrupt_pending(base_address))
                return IRQ_NONE;

diff --git a/drivers/misc/ibmasm/lowlevel.h b/drivers/misc/ibmasm/lowlevel.h
index 4339504d21a85033182afb98512483f07e11c664..e5ed59c589aa72883f8858d2eb1c17c45c1f1132 100644 (file)
--- a/drivers/misc/ibmasm/lowlevel.h
+++ b/drivers/misc/ibmasm/lowlevel.h
@@ -52,51 +52,51 @@
 #define SCOUT_COM_C_BASE         0x0200   
 #define SCOUT_COM_D_BASE         0x0300   
 
-static inline int sp_interrupt_pending(void *base_address)
+static inline int sp_interrupt_pending(void __iomem *base_address)
 {
        return SP_INTR_MASK & readl(base_address + INTR_STATUS_REGISTER);
 }
 
-static inline int uart_interrupt_pending(void *base_address)
+static inline int uart_interrupt_pending(void __iomem *base_address)
 {
        return UART_INTR_MASK & readl(base_address + INTR_STATUS_REGISTER);
 }
 
-static inline void ibmasm_enable_interrupts(void *base_address, int mask)
+static inline void ibmasm_enable_interrupts(void __iomem *base_address, int mask)
 {
-       void *ctrl_reg = base_address + INTR_CONTROL_REGISTER;
+       void __iomem *ctrl_reg = base_address + INTR_CONTROL_REGISTER;
        writel( readl(ctrl_reg) & ~mask, ctrl_reg);
 }
 
-static inline void ibmasm_disable_interrupts(void *base_address, int mask)
+static inline void ibmasm_disable_interrupts(void __iomem *base_address, int mask)
 {
-       void *ctrl_reg = base_address + INTR_CONTROL_REGISTER;
+       void __iomem *ctrl_reg = base_address + INTR_CONTROL_REGISTER;
        writel( readl(ctrl_reg) | mask, ctrl_reg);
 }
 
-static inline void enable_sp_interrupts(void *base_address)
+static inline void enable_sp_interrupts(void __iomem *base_address)
 {
        ibmasm_enable_interrupts(base_address, SP_INTR_MASK);
 }
 
-static inline void disable_sp_interrupts(void *base_address)
+static inline void disable_sp_interrupts(void __iomem *base_address)
 {
        ibmasm_disable_interrupts(base_address, SP_INTR_MASK);
 }
 
-static inline void enable_uart_interrupts(void *base_address)
+static inline void enable_uart_interrupts(void __iomem *base_address)
 {
        ibmasm_enable_interrupts(base_address, UART_INTR_MASK); 
 }
 
-static inline void disable_uart_interrupts(void *base_address)
+static inline void disable_uart_interrupts(void __iomem *base_address)
 {
        ibmasm_disable_interrupts(base_address, UART_INTR_MASK); 
 }
 
 #define valid_mfa(mfa) ( (mfa) != NO_MFAS_AVAILABLE )
 
-static inline u32 get_mfa_outbound(void *base_address)
+static inline u32 get_mfa_outbound(void __iomem *base_address)
 {
        int retry;
        u32 mfa;
@@ -109,12 +109,12 @@ static inline u32 get_mfa_outbound(void *base_address)
        return mfa;
 }
 
-static inline void set_mfa_outbound(void *base_address, u32 mfa)
+static inline void set_mfa_outbound(void __iomem *base_address, u32 mfa)
 {
        writel(mfa, base_address + OUTBOUND_QUEUE_PORT);
 }
 
-static inline u32 get_mfa_inbound(void *base_address)
+static inline u32 get_mfa_inbound(void __iomem *base_address)
 {
        u32 mfa = readl(base_address + INBOUND_QUEUE_PORT);
 
@@ -124,12 +124,12 @@ static inline u32 get_mfa_inbound(void *base_address)
        return mfa;
 }
 
-static inline void set_mfa_inbound(void *base_address, u32 mfa)
+static inline void set_mfa_inbound(void __iomem *base_address, u32 mfa)
 {
        writel(mfa, base_address + INBOUND_QUEUE_PORT);
 }
 
-static inline struct i2o_message *get_i2o_message(void *base_address, u32 mfa)
+static inline struct i2o_message *get_i2o_message(void __iomem *base_address, u32 mfa)
 {
        return (struct i2o_message *)(GET_MFA_ADDR(mfa) + base_address);
 }

diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 604b87ecaf44600c7d43cf5aecfafc810aef433f..914804512dba00e7bb3971927a6b7b77e0382824 100644 (file)
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -34,7 +34,7 @@
 void ibmasm_register_uart(struct service_processor *sp)
 {
        struct serial_struct serial;
-       unsigned char *iomem_base;
+       void __iomem *iomem_base;
 
        iomem_base = sp->base_address + SCOUT_COM_B_BASE;