net/sonic: Remove explicit memory barriers
authorFinn Thain <fthain@telegraphics.com.au>
Sat, 15 Feb 2020 21:03:32 +0000 (08:03 +1100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 17 Feb 2020 03:48:22 +0000 (19:48 -0800)
The explicit memory barriers are redundant now that proper locking and
MMIO accessors have been employed.

Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/natsemi/sonic.c

index 1d6de67..508c6a8 100644 (file)
@@ -311,12 +311,10 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev)
        sonic_tda_put(dev, entry, SONIC_TD_LINK,
                sonic_tda_get(dev, entry, SONIC_TD_LINK) | SONIC_EOL);
 
-       wmb();
        lp->tx_len[entry] = length;
        lp->tx_laddr[entry] = laddr;
        lp->tx_skb[entry] = skb;
 
-       wmb();
        sonic_tda_put(dev, lp->eol_tx, SONIC_TD_LINK,
                                  sonic_tda_get(dev, lp->eol_tx, SONIC_TD_LINK) & ~SONIC_EOL);
        lp->eol_tx = entry;