aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/s2io.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 7ca78228b104..5dda043bd9d7 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -686,7 +686,7 @@ static void free_shared_mem(struct s2io_nic *nic)
686 686
687static int s2io_verify_pci_mode(nic_t *nic) 687static int s2io_verify_pci_mode(nic_t *nic)
688{ 688{
689 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 689 XENA_dev_config_t __iomem *bar0 = nic->bar0;
690 register u64 val64 = 0; 690 register u64 val64 = 0;
691 int mode; 691 int mode;
692 692
@@ -704,7 +704,7 @@ static int s2io_verify_pci_mode(nic_t *nic)
704 */ 704 */
705static int s2io_print_pci_mode(nic_t *nic) 705static int s2io_print_pci_mode(nic_t *nic)
706{ 706{
707 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 707 XENA_dev_config_t __iomem *bar0 = nic->bar0;
708 register u64 val64 = 0; 708 register u64 val64 = 0;
709 int mode; 709 int mode;
710 struct config_param *config = &nic->config; 710 struct config_param *config = &nic->config;
@@ -1403,7 +1403,7 @@ static int init_nic(struct s2io_nic *nic)
1403 writeq(0xffbbffbbffbbffbbULL, &bar0->mc_pause_thresh_q4q7); 1403 writeq(0xffbbffbbffbbffbbULL, &bar0->mc_pause_thresh_q4q7);
1404 1404
1405 /* Disable RMAC PAD STRIPPING */ 1405 /* Disable RMAC PAD STRIPPING */
1406 add = (void *) &bar0->mac_cfg; 1406 add = &bar0->mac_cfg;
1407 val64 = readq(&bar0->mac_cfg); 1407 val64 = readq(&bar0->mac_cfg);
1408 val64 &= ~(MAC_CFG_RMAC_STRIP_PAD); 1408 val64 &= ~(MAC_CFG_RMAC_STRIP_PAD);
1409 writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key); 1409 writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key);
@@ -1934,7 +1934,7 @@ static int start_nic(struct s2io_nic *nic)
1934 val64 |= 0x0000800000000000ULL; 1934 val64 |= 0x0000800000000000ULL;
1935 writeq(val64, &bar0->gpio_control); 1935 writeq(val64, &bar0->gpio_control);
1936 val64 = 0x0411040400000000ULL; 1936 val64 = 0x0411040400000000ULL;
1937 writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700)); 1937 writeq(val64, (void __iomem *)bar0 + 0x2700);
1938 } 1938 }
1939 1939
1940 /* 1940 /*
@@ -2395,7 +2395,7 @@ static int s2io_poll(struct net_device *dev, int *budget)
2395 int pkt_cnt = 0, org_pkts_to_process; 2395 int pkt_cnt = 0, org_pkts_to_process;
2396 mac_info_t *mac_control; 2396 mac_info_t *mac_control;
2397 struct config_param *config; 2397 struct config_param *config;
2398 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; 2398 XENA_dev_config_t __iomem *bar0 = nic->bar0;
2399 u64 val64; 2399 u64 val64;
2400 int i; 2400 int i;
2401 2401
@@ -2831,7 +2831,7 @@ void s2io_reset(nic_t * sp)
2831 val64 |= 0x0000800000000000ULL; 2831 val64 |= 0x0000800000000000ULL;
2832 writeq(val64, &bar0->gpio_control); 2832 writeq(val64, &bar0->gpio_control);
2833 val64 = 0x0411040400000000ULL; 2833 val64 = 0x0411040400000000ULL;
2834 writeq(val64, (void __iomem *) ((u8 *) bar0 + 0x2700)); 2834 writeq(val64, (void __iomem *)bar0 + 0x2700);
2835 } 2835 }
2836 2836
2837 /* 2837 /*
@@ -3234,7 +3234,7 @@ s2io_alarm_handle(unsigned long data)
3234 3234
3235static void s2io_txpic_intr_handle(nic_t *sp) 3235static void s2io_txpic_intr_handle(nic_t *sp)
3236{ 3236{
3237 XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0; 3237 XENA_dev_config_t __iomem *bar0 = sp->bar0;
3238 u64 val64; 3238 u64 val64;
3239 3239
3240 val64 = readq(&bar0->pic_int_status); 3240 val64 = readq(&bar0->pic_int_status);