>From d7467f45553b5dca2c6ef094c49e15b2385e3659 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <8f1b87a115f6c340558b95f6a1748ddbf866d95f.1441670158.git.romieu@fr.zoreil.com> References: <8f1b87a115f6c340558b95f6a1748ddbf866d95f.1441670158.git.romieu@fr.zoreil.com> From: Francois Romieu Date: Sat, 5 Sep 2015 13:30:41 +0200 Subject: [PATCH 2/3] r8169: use a single condition to check the completion of counters commands. X-Organisation: Land of Sunshine Inc. Signed-off-by: Francois Romieu --- drivers/net/ethernet/realtek/r8169.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index ff1b834..f8a81a9 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -2190,6 +2190,13 @@ static int rtl8169_get_sset_count(struct net_device *dev, int sset) } } +DECLARE_RTL_COND(rtl_cmd_counters_cond) +{ + void __iomem *ioaddr = tp->mmio_addr; + + return RTL_R32(CounterAddrLow) & (CounterReset | CounterDump); +} + static struct rtl8169_counters *rtl8169_map_counters(struct net_device *dev, dma_addr_t *paddr, u32 counter_cmd) @@ -2224,13 +2231,6 @@ static void rtl8169_unmap_counters (struct net_device *dev, dma_free_coherent(d, sizeof(*counters), counters, paddr); } -DECLARE_RTL_COND(rtl_reset_counters_cond) -{ - void __iomem *ioaddr = tp->mmio_addr; - - return RTL_R32(CounterAddrLow) & CounterReset; -} - static bool rtl8169_reset_counters(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); @@ -2249,7 +2249,7 @@ static bool rtl8169_reset_counters(struct net_device *dev) if (!counters) return false; - if (!rtl_udelay_loop_wait_low(tp, &rtl_reset_counters_cond, 10, 1000)) + if (!rtl_udelay_loop_wait_low(tp, &rtl_cmd_counters_cond, 10, 1000)) ret = false; rtl8169_unmap_counters(dev, paddr, counters); @@ -2257,13 +2257,6 @@ static bool rtl8169_reset_counters(struct net_device *dev) return ret; } -DECLARE_RTL_COND(rtl_counters_cond) -{ - void __iomem *ioaddr = tp->mmio_addr; - - return RTL_R32(CounterAddrLow) & CounterDump; -} - static bool rtl8169_update_counters(struct net_device *dev) { struct rtl8169_private *tp = netdev_priv(dev); @@ -2283,7 +2276,7 @@ static bool rtl8169_update_counters(struct net_device *dev) if (!counters) return false; - if (rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000)) + if (rtl_udelay_loop_wait_low(tp, &rtl_cmd_counters_cond, 10, 1000)) memcpy(tp->counters, counters, sizeof(*counters)); else ret = false; -- 2.4.3