Skip to content

Commit

Permalink
r8169: remove unneeded mmiowb barriers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Nov 28, 2018
1 parent 5d49793 commit bd7153b
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit bd7153b

Please sign in to comment.