2 files changed, 2 insertions, 3 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 51b3b68528ee..590e95b4cbfa 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -677,7 +677,7 @@ static void stmmac_tx(struct stmmac_priv *priv)
 
                 priv->hw->desc->release_tx_desc(p);
 
-                entry = (++priv->dirty_tx) % txsize;
+                priv->dirty_tx++;
         }
         if (unlikely(netif_queue_stopped(priv->dev) &&
                      stmmac_tx_avail(priv) > STMMAC_TX_THRESH(priv))) {
@@ -1308,7 +1308,6 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit)
                 display_ring(priv->dma_rx, rxsize);
         }
 #endif
-        count = 0;
         while (!priv->hw->desc->get_rx_owner(p)) {
                 int status;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 680d2b8dfe27..20eb5026c49c 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -190,7 +190,7 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
 
-        iounmap((void *)priv->ioaddr);
+        iounmap((void __force __iomem *)priv->ioaddr);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(res->start, resource_size(res));