diff options
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 5303a96b4327..258128a6a271 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -3070,7 +3070,7 @@ int s2io_set_swapper(nic_t * sp) | |||
3070 | 3070 | ||
3071 | static int wait_for_msix_trans(nic_t *nic, int i) | 3071 | static int wait_for_msix_trans(nic_t *nic, int i) |
3072 | { | 3072 | { |
3073 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3073 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3074 | u64 val64; | 3074 | u64 val64; |
3075 | int ret = 0, cnt = 0; | 3075 | int ret = 0, cnt = 0; |
3076 | 3076 | ||
@@ -3091,7 +3091,7 @@ static int wait_for_msix_trans(nic_t *nic, int i) | |||
3091 | 3091 | ||
3092 | void restore_xmsi_data(nic_t *nic) | 3092 | void restore_xmsi_data(nic_t *nic) |
3093 | { | 3093 | { |
3094 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3094 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3095 | u64 val64; | 3095 | u64 val64; |
3096 | int i; | 3096 | int i; |
3097 | 3097 | ||
@@ -3109,7 +3109,7 @@ void restore_xmsi_data(nic_t *nic) | |||
3109 | 3109 | ||
3110 | static void store_xmsi_data(nic_t *nic) | 3110 | static void store_xmsi_data(nic_t *nic) |
3111 | { | 3111 | { |
3112 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3112 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3113 | u64 val64, addr, data; | 3113 | u64 val64, addr, data; |
3114 | int i; | 3114 | int i; |
3115 | 3115 | ||
@@ -3132,7 +3132,7 @@ static void store_xmsi_data(nic_t *nic) | |||
3132 | 3132 | ||
3133 | int s2io_enable_msi(nic_t *nic) | 3133 | int s2io_enable_msi(nic_t *nic) |
3134 | { | 3134 | { |
3135 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3135 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3136 | u16 msi_ctrl, msg_val; | 3136 | u16 msi_ctrl, msg_val; |
3137 | struct config_param *config = &nic->config; | 3137 | struct config_param *config = &nic->config; |
3138 | struct net_device *dev = nic->dev; | 3138 | struct net_device *dev = nic->dev; |
@@ -3182,7 +3182,7 @@ int s2io_enable_msi(nic_t *nic) | |||
3182 | 3182 | ||
3183 | int s2io_enable_msi_x(nic_t *nic) | 3183 | int s2io_enable_msi_x(nic_t *nic) |
3184 | { | 3184 | { |
3185 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3185 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3186 | u64 tx_mat, rx_mat; | 3186 | u64 tx_mat, rx_mat; |
3187 | u16 msi_control; /* Temp variable */ | 3187 | u16 msi_control; /* Temp variable */ |
3188 | int ret, i, j, msix_indx = 1; | 3188 | int ret, i, j, msix_indx = 1; |