[PATCH 4.4 36/87] r8152: use test_and_clear_bit

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: hayeswang <hayesw...@realtek.com>

commit 216a8349d3a0dd1bc2afbcc821e374c8f929bd62 upstream.

Replace test_bit() followed by clear_bit() with test_and_clear_bit().

Signed-off-by: Hayes Wang <hayesw...@realtek.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Oliver Neukum <oneu...@suse.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>

---
 drivers/net/usb/r8152.c |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1947,7 +1947,6 @@ static void _rtl8152_set_rx_mode(struct
        __le32 tmp[2];
        u32 ocp_data;
 
-       clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
        netif_stop_queue(netdev);
        ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
        ocp_data &= ~RCR_ACPT_ALL;
@@ -2433,8 +2432,6 @@ static void rtl_phy_reset(struct r8152 *
        u16 data;
        int i;
 
-       clear_bit(PHY_RESET, &tp->flags);
-
        data = r8152_mdio_read(tp, MII_BMCR);
 
        /* don't reset again before the previous one complete */
@@ -2893,10 +2890,9 @@ static int rtl8152_set_speed(struct r815
        r8152_mdio_write(tp, MII_ADVERTISE, anar);
        r8152_mdio_write(tp, MII_BMCR, bmcr);
 
-       if (test_bit(PHY_RESET, &tp->flags)) {
+       if (test_and_clear_bit(PHY_RESET, &tp->flags)) {
                int i;
 
-               clear_bit(PHY_RESET, &tp->flags);
                for (i = 0; i < 50; i++) {
                        msleep(20);
                        if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0)
@@ -2905,7 +2901,6 @@ static int rtl8152_set_speed(struct r815
        }
 
 out:
-
        return ret;
 }
 
@@ -2992,7 +2987,6 @@ static void set_carrier(struct r8152 *tp
        struct net_device *netdev = tp->netdev;
        u8 speed;
 
-       clear_bit(RTL8152_LINK_CHG, &tp->flags);
        speed = rtl8152_get_speed(tp);
 
        if (speed & LINK_STATUS) {
@@ -3042,20 +3036,18 @@ static void rtl_work_func_t(struct work_
                goto out1;
        }
 
-       if (test_bit(RTL8152_LINK_CHG, &tp->flags))
+       if (test_and_clear_bit(RTL8152_LINK_CHG, &tp->flags))
                set_carrier(tp);
 
-       if (test_bit(RTL8152_SET_RX_MODE, &tp->flags))
+       if (test_and_clear_bit(RTL8152_SET_RX_MODE, &tp->flags))
                _rtl8152_set_rx_mode(tp->netdev);
 
        /* don't schedule napi before linking */
-       if (test_bit(SCHEDULE_NAPI, &tp->flags) &&
-           netif_carrier_ok(tp->netdev)) {
-               clear_bit(SCHEDULE_NAPI, &tp->flags);
+       if (test_and_clear_bit(SCHEDULE_NAPI, &tp->flags) &&
+           netif_carrier_ok(tp->netdev))
                napi_schedule(&tp->napi);
-       }
 
-       if (test_bit(PHY_RESET, &tp->flags))
+       if (test_and_clear_bit(PHY_RESET, &tp->flags))
                rtl_phy_reset(tp);
 
        mutex_unlock(&tp->control);