]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
r8169: remove unneeded mmiowb barriers
authorHeiner Kallweit <hkallweit1@gmail.com>
Mon, 26 Nov 2018 19:24:16 +0000 (20:24 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2018 00:36:28 +0000 (16:36 -0800)
writex() has implicit barriers, that's what makes it different from
writex_relaxed(). Therefore these calls to mmiowb() can be removed.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/realtek/r8169.c

index 3624e67aef72c92ed6e908e2c99ac2d381210126..e26c48bd54a237a7e62ec6f7540d258f70347fc5 100644 (file)
@@ -1283,13 +1283,11 @@ static u16 rtl_get_events(struct rtl8169_private *tp)
 static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
 {
        RTL_W16(tp, IntrStatus, bits);
-       mmiowb();
 }
 
 static void rtl_irq_disable(struct rtl8169_private *tp)
 {
        RTL_W16(tp, IntrMask, 0);
-       mmiowb();
 }
 
 #define RTL_EVENT_NAPI_RX      (RxOK | RxErr)
@@ -6127,10 +6125,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
        if (unlikely(stop_queue))
                netif_stop_queue(dev);
 
-       if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) {
+       if (__netdev_sent_queue(dev, skb->len, skb->xmit_more))
                RTL_W8(tp, TxPoll, NPQ);
-               mmiowb();
-       }
 
        if (unlikely(stop_queue)) {
                /* Sync with rtl_tx:
@@ -6481,9 +6477,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
 
        if (work_done < budget) {
                napi_complete_done(napi, work_done);
-
                rtl_irq_enable(tp);
-               mmiowb();
        }
 
        return work_done;