aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2018-11-26 14:24:16 -0500
committerDavid S. Miller <davem@davemloft.net>2018-11-27 19:36:28 -0500
commitbd7153bd83b806bfcc2e79b7a6f43aa653d06ef3 (patch)
tree3592c92bc51bf40cc2efb2cd64db9c7498310428
parent5d497936756fa2a917643ca688585d721dc6d31e (diff)
r8169: remove unneeded mmiowb barriers
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>
-rw-r--r--drivers/net/ethernet/realtek/r8169.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 3624e67aef72..e26c48bd54a2 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1283,13 +1283,11 @@ static u16 rtl_get_events(struct rtl8169_private *tp)
1283static void rtl_ack_events(struct rtl8169_private *tp, u16 bits) 1283static void rtl_ack_events(struct rtl8169_private *tp, u16 bits)
1284{ 1284{
1285 RTL_W16(tp, IntrStatus, bits); 1285 RTL_W16(tp, IntrStatus, bits);
1286 mmiowb();
1287} 1286}
1288 1287
1289static void rtl_irq_disable(struct rtl8169_private *tp) 1288static void rtl_irq_disable(struct rtl8169_private *tp)
1290{ 1289{
1291 RTL_W16(tp, IntrMask, 0); 1290 RTL_W16(tp, IntrMask, 0);
1292 mmiowb();
1293} 1291}
1294 1292
1295#define RTL_EVENT_NAPI_RX (RxOK | RxErr) 1293#define RTL_EVENT_NAPI_RX (RxOK | RxErr)
@@ -6127,10 +6125,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
6127 if (unlikely(stop_queue)) 6125 if (unlikely(stop_queue))
6128 netif_stop_queue(dev); 6126 netif_stop_queue(dev);
6129 6127
6130 if (__netdev_sent_queue(dev, skb->len, skb->xmit_more)) { 6128 if (__netdev_sent_queue(dev, skb->len, skb->xmit_more))
6131 RTL_W8(tp, TxPoll, NPQ); 6129 RTL_W8(tp, TxPoll, NPQ);
6132 mmiowb();
6133 }
6134 6130
6135 if (unlikely(stop_queue)) { 6131 if (unlikely(stop_queue)) {
6136 /* Sync with rtl_tx: 6132 /* Sync with rtl_tx:
@@ -6481,9 +6477,7 @@ static int rtl8169_poll(struct napi_struct *napi, int budget)
6481 6477
6482 if (work_done < budget) { 6478 if (work_done < budget) {
6483 napi_complete_done(napi, work_done); 6479 napi_complete_done(napi, work_done);
6484
6485 rtl_irq_enable(tp); 6480 rtl_irq_enable(tp);
6486 mmiowb();
6487 } 6481 }
6488 6482
6489 return work_done; 6483 return work_done;