3 files changed, 13 insertions, 14 deletions

diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c
index 803b0373d843..c0a1c9df3ac7 100644
--- a/drivers/net/stmmac/dwmac100.c
+++ b/drivers/net/stmmac/dwmac100.c
@@ -138,7 +138,7 @@ static void dwmac100_dump_dma_regs(unsigned long ioaddr)
 {
         int i;
 
-        DBG(KERN_DEBUG "DWMAC 100 DMA CSR \n");
+        DBG(KERN_DEBUG "DWMAC 100 DMA CSR\n");
         for (i = 0; i < 9; i++)
                 pr_debug("\t CSR%d (offset 0x%x): 0x%08x\n", i,
                        (DMA_BUS_MODE + i * 4),
@@ -316,7 +316,7 @@ static void dwmac100_set_filter(struct net_device *dev)
                            MAC_CONTROL_HO | MAC_CONTROL_HP);
         } else {
                 u32 mc_filter[2];
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 /* Perfect filter mode for physical address and Hash
                    filter for multicast */
@@ -325,11 +325,11 @@ static void dwmac100_set_filter(struct net_device *dev)
                            MAC_CONTROL_IF | MAC_CONTROL_HO);
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
+                netdev_for_each_mc_addr(ha, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
                          * index the contens of the hash table */
                         int bit_nr =
-                            ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
+                            ether_crc(ETH_ALEN, ha->addr) >> 26;
                         /* The most significant bit determines the register to
                          * use (H/L) while the other 5 bits determine the bit
                          * within the register. */
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c
index a6538ae4694c..bf73fda6adfb 100644
--- a/drivers/net/stmmac/dwmac1000_core.c
+++ b/drivers/net/stmmac/dwmac1000_core.c
@@ -94,17 +94,17 @@ static void dwmac1000_set_filter(struct net_device *dev)
                 writel(0xffffffff, ioaddr + GMAC_HASH_LOW);
         } else if (!netdev_mc_empty(dev)) {
                 u32 mc_filter[2];
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 /* Hash filter for multicast */
                 value = GMAC_FRAME_FILTER_HMC;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
+                netdev_for_each_mc_addr(ha, dev) {
                         /* The upper 6 bits of the calculated CRC are used to
                            index the contens of the hash table */
                         int bit_nr =
-                            bitrev32(~crc32_le(~0, mclist->dmi_addr, 6)) >> 26;
+                            bitrev32(~crc32_le(~0, ha->addr, 6)) >> 26;
                         /* The most significant bit determines the register to
                          * use (H/L) while the other 5 bits determine the bit
                          * within the register. */
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index a6733612d64a..963f591f1e0e 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/drivers/net/stmmac/stmmac_main.c
@@ -836,7 +836,7 @@ static int stmmac_open(struct net_device *dev)
 #ifdef CONFIG_STMMAC_TIMER
         priv->tm = kzalloc(sizeof(struct stmmac_timer *), GFP_KERNEL);
         if (unlikely(priv->tm == NULL)) {
-                pr_err("%s: ERROR: timer memory alloc failed \n", __func__);
+                pr_err("%s: ERROR: timer memory alloc failed\n", __func__);
                 return -ENOMEM;
         }
         priv->tm->freq = tmrate;
@@ -1685,8 +1685,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
         }
         pr_info("done!\n");
 
-        if (!request_mem_region(res->start, (res->end - res->start),
-                                pdev->name)) {
+        if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
                 pr_err("%s: ERROR: memory allocation failed"
                        "cannot get the I/O addr 0x%x\n",
                        __func__, (unsigned int)res->start);
@@ -1694,9 +1693,9 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
                 goto out;
         }
 
-        addr = ioremap(res->start, (res->end - res->start));
+        addr = ioremap(res->start, resource_size(res));
         if (!addr) {
-                pr_err("%s: ERROR: memory mapping failed \n", __func__);
+                pr_err("%s: ERROR: memory mapping failed\n", __func__);
                 ret = -ENOMEM;
                 goto out;
         }
@@ -1774,7 +1773,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
 out:
         if (ret < 0) {
                 platform_set_drvdata(pdev, NULL);
-                release_mem_region(res->start, (res->end - res->start));
+                release_mem_region(res->start, resource_size(res));
                 if (addr != NULL)
                         iounmap(addr);
         }
@@ -1812,7 +1811,7 @@ static int stmmac_dvr_remove(struct platform_device *pdev)
 
         iounmap((void *)ndev->base_addr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, (res->end - res->start));
+        release_mem_region(res->start, resource_size(res));
 
         free_netdev(ndev);