1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index f5dbeb27b6f0..1bf23e41f580 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2904,7 +2904,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
 {
         u64 val64 = 0x0;
         nic_t *sp = dev->priv;
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+        XENA_dev_config_t __iomem *bar0 = sp->bar0;
 
         //address transaction
         val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -2953,7 +2953,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
         u64 val64 = 0x0;
         u64 rval64 = 0x0;
         nic_t *sp = dev->priv;
-        XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0;
+        XENA_dev_config_t __iomem *bar0 = sp->bar0;
 
         /* address transaction */
         val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -3276,7 +3276,7 @@ static void alarm_intr_handler(struct s2io_nic *nic)
  *   SUCCESS on success and FAILURE on failure.
  */
 
-static int wait_for_cmd_complete(void *addr, u64 busy_bit)
+static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit)
 {
         int ret = FAILURE, cnt = 0;
         u64 val64;
@@ -4303,11 +4303,11 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev)
         sp->stats.tx_errors =
                 le32_to_cpu(mac_control->stats_info->tmac_any_err_frms);
         sp->stats.rx_errors =
-                le32_to_cpu(mac_control->stats_info->rmac_drop_frms);
+                le64_to_cpu(mac_control->stats_info->rmac_drop_frms);
         sp->stats.multicast =
                 le32_to_cpu(mac_control->stats_info->rmac_vld_mcst_frms);
         sp->stats.rx_length_errors =
-                le32_to_cpu(mac_control->stats_info->rmac_long_frms);
+                le64_to_cpu(mac_control->stats_info->rmac_long_frms);
 
         return (&sp->stats);
 }