aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-10-29 01:36:27 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-29 13:35:07 -0400
commit7533624527b9afa5585ca43ba534758052d848e5 (patch)
treec8a1893417aa948d38d6e52e7de65b9103231d72
parent8d027de54c77d38eedc9b331c7a2a39807d34691 (diff)
[PATCH] s2io iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/s2io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index d303d162974f..62d5041845e3 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3045,7 +3045,7 @@ int s2io_set_swapper(nic_t * sp)
3045 3045
3046int wait_for_msix_trans(nic_t *nic, int i) 3046int wait_for_msix_trans(nic_t *nic, int i)
3047{ 3047{
3048 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3048 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3049 u64 val64; 3049 u64 val64;
3050 int ret = 0, cnt = 0; 3050 int ret = 0, cnt = 0;
3051 3051
@@ -3066,7 +3066,7 @@ int wait_for_msix_trans(nic_t *nic, int i)
3066 3066
3067void restore_xmsi_data(nic_t *nic) 3067void restore_xmsi_data(nic_t *nic)
3068{ 3068{
3069 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3069 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3070 u64 val64; 3070 u64 val64;
3071 int i; 3071 int i;
3072 3072
@@ -3084,7 +3084,7 @@ void restore_xmsi_data(nic_t *nic)
3084 3084
3085void store_xmsi_data(nic_t *nic) 3085void store_xmsi_data(nic_t *nic)
3086{ 3086{
3087 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3087 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3088 u64 val64, addr, data; 3088 u64 val64, addr, data;
3089 int i; 3089 int i;
3090 3090
@@ -3107,7 +3107,7 @@ void store_xmsi_data(nic_t *nic)
3107 3107
3108int s2io_enable_msi(nic_t *nic) 3108int s2io_enable_msi(nic_t *nic)
3109{ 3109{
3110 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3110 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3111 u16 msi_ctrl, msg_val; 3111 u16 msi_ctrl, msg_val;
3112 struct config_param *config = &nic->config; 3112 struct config_param *config = &nic->config;
3113 struct net_device *dev = nic->dev; 3113 struct net_device *dev = nic->dev;
@@ -3157,7 +3157,7 @@ int s2io_enable_msi(nic_t *nic)
3157 3157
3158int s2io_enable_msi_x(nic_t *nic) 3158int s2io_enable_msi_x(nic_t *nic)
3159{ 3159{
3160 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3160 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3161 u64 tx_mat, rx_mat; 3161 u64 tx_mat, rx_mat;
3162 u16 msi_control; /* Temp variable */ 3162 u16 msi_control; /* Temp variable */
3163 int ret, i, j, msix_indx = 1; 3163 int ret, i, j, msix_indx = 1;