提交 37eb47ed 编写于 作者: A Al Viro 提交者: Linus Torvalds

[PATCH] s2io: __iomem annotations for recent changes

Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 51bfb75b
...@@ -3078,7 +3078,7 @@ int s2io_set_swapper(nic_t * sp) ...@@ -3078,7 +3078,7 @@ int s2io_set_swapper(nic_t * sp)
static int wait_for_msix_trans(nic_t *nic, int i) static int wait_for_msix_trans(nic_t *nic, int i)
{ {
XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64; u64 val64;
int ret = 0, cnt = 0; int ret = 0, cnt = 0;
...@@ -3099,7 +3099,7 @@ static int wait_for_msix_trans(nic_t *nic, int i) ...@@ -3099,7 +3099,7 @@ static int wait_for_msix_trans(nic_t *nic, int i)
void restore_xmsi_data(nic_t *nic) void restore_xmsi_data(nic_t *nic)
{ {
XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64; u64 val64;
int i; int i;
...@@ -3117,7 +3117,7 @@ void restore_xmsi_data(nic_t *nic) ...@@ -3117,7 +3117,7 @@ void restore_xmsi_data(nic_t *nic)
static void store_xmsi_data(nic_t *nic) static void store_xmsi_data(nic_t *nic)
{ {
XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 val64, addr, data; u64 val64, addr, data;
int i; int i;
...@@ -3140,7 +3140,7 @@ static void store_xmsi_data(nic_t *nic) ...@@ -3140,7 +3140,7 @@ static void store_xmsi_data(nic_t *nic)
int s2io_enable_msi(nic_t *nic) int s2io_enable_msi(nic_t *nic)
{ {
XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; XENA_dev_config_t __iomem *bar0 = nic->bar0;
u16 msi_ctrl, msg_val; u16 msi_ctrl, msg_val;
struct config_param *config = &nic->config; struct config_param *config = &nic->config;
struct net_device *dev = nic->dev; struct net_device *dev = nic->dev;
...@@ -3190,7 +3190,7 @@ int s2io_enable_msi(nic_t *nic) ...@@ -3190,7 +3190,7 @@ int s2io_enable_msi(nic_t *nic)
int s2io_enable_msi_x(nic_t *nic) int s2io_enable_msi_x(nic_t *nic)
{ {
XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; XENA_dev_config_t __iomem *bar0 = nic->bar0;
u64 tx_mat, rx_mat; u64 tx_mat, rx_mat;
u16 msi_control; /* Temp variable */ u16 msi_control; /* Temp variable */
int ret, i, j, msix_indx = 1; int ret, i, j, msix_indx = 1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册