git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
misc
/
ibmasm
/
lowlevel.h
diff --git
a/drivers/misc/ibmasm/lowlevel.h
b/drivers/misc/ibmasm/lowlevel.h
index
4339504
..
e5ed59c
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
#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);
}
{
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);
}
{
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);
}
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);
}
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);
}
{
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);
}
{
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);
}
{
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 )
{
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;
{
int retry;
u32 mfa;
@@
-109,12
+109,12
@@
static inline u32 get_mfa_outbound(void *base_address)
return mfa;
}
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);
}
{
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);
{
u32 mfa = readl(base_address + INBOUND_QUEUE_PORT);
@@
-124,12
+124,12
@@
static inline u32 get_mfa_inbound(void *base_address)
return mfa;
}
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);
}
{
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);
}
{
return (struct i2o_message *)(GET_MFA_ADDR(mfa) + base_address);
}