aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net')
-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 5ea897714a14..3f5e93aad5c7 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3044,7 +3044,7 @@ int s2io_set_swapper(nic_t * sp)
3044 3044
3045int wait_for_msix_trans(nic_t *nic, int i) 3045int wait_for_msix_trans(nic_t *nic, int i)
3046{ 3046{
3047 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3047 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3048 u64 val64; 3048 u64 val64;
3049 int ret = 0, cnt = 0; 3049 int ret = 0, cnt = 0;
3050 3050
@@ -3065,7 +3065,7 @@ int wait_for_msix_trans(nic_t *nic, int i)
3065 3065
3066void restore_xmsi_data(nic_t *nic) 3066void restore_xmsi_data(nic_t *nic)
3067{ 3067{
3068 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3068 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3069 u64 val64; 3069 u64 val64;
3070 int i; 3070 int i;
3071 3071
@@ -3083,7 +3083,7 @@ void restore_xmsi_data(nic_t *nic)
3083 3083
3084void store_xmsi_data(nic_t *nic) 3084void store_xmsi_data(nic_t *nic)
3085{ 3085{
3086 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3086 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3087 u64 val64, addr, data; 3087 u64 val64, addr, data;
3088 int i; 3088 int i;
3089 3089
@@ -3106,7 +3106,7 @@ void store_xmsi_data(nic_t *nic)
3106 3106
3107int s2io_enable_msi(nic_t *nic) 3107int s2io_enable_msi(nic_t *nic)
3108{ 3108{
3109 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3109 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3110 u16 msi_ctrl, msg_val; 3110 u16 msi_ctrl, msg_val;
3111 struct config_param *config = &nic->config; 3111 struct config_param *config = &nic->config;
3112 struct net_device *dev = nic->dev; 3112 struct net_device *dev = nic->dev;
@@ -3156,7 +3156,7 @@ int s2io_enable_msi(nic_t *nic)
3156 3156
3157int s2io_enable_msi_x(nic_t *nic) 3157int s2io_enable_msi_x(nic_t *nic)
3158{ 3158{
3159 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 3159 XENA_dev_config_t __iomem *bar0 = nic->bar0;
3160 u64 tx_mat, rx_mat; 3160 u64 tx_mat, rx_mat;
3161 u16 msi_control; /* Temp variable */ 3161 u16 msi_control; /* Temp variable */
3162 int ret, i, j, msix_indx = 1; 3162 int ret, i, j, msix_indx = 1;