Commit 216a8349 authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

r8152: use test_and_clear_bit



Replace test_bit() followed by clear_bit() with test_and_clear_bit().
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01dd194c
...@@ -1938,7 +1938,6 @@ static void _rtl8152_set_rx_mode(struct net_device *netdev) ...@@ -1938,7 +1938,6 @@ static void _rtl8152_set_rx_mode(struct net_device *netdev)
__le32 tmp[2]; __le32 tmp[2];
u32 ocp_data; u32 ocp_data;
clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
netif_stop_queue(netdev); netif_stop_queue(netdev);
ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
ocp_data &= ~RCR_ACPT_ALL; ocp_data &= ~RCR_ACPT_ALL;
...@@ -2424,8 +2423,6 @@ static void rtl_phy_reset(struct r8152 *tp) ...@@ -2424,8 +2423,6 @@ static void rtl_phy_reset(struct r8152 *tp)
u16 data; u16 data;
int i; int i;
clear_bit(PHY_RESET, &tp->flags);
data = r8152_mdio_read(tp, MII_BMCR); data = r8152_mdio_read(tp, MII_BMCR);
/* don't reset again before the previous one complete */ /* don't reset again before the previous one complete */
...@@ -2884,10 +2881,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -2884,10 +2881,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
r8152_mdio_write(tp, MII_ADVERTISE, anar); r8152_mdio_write(tp, MII_ADVERTISE, anar);
r8152_mdio_write(tp, MII_BMCR, bmcr); 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; int i;
clear_bit(PHY_RESET, &tp->flags);
for (i = 0; i < 50; i++) { for (i = 0; i < 50; i++) {
msleep(20); msleep(20);
if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0) if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0)
...@@ -2896,7 +2892,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -2896,7 +2892,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
} }
out: out:
return ret; return ret;
} }
...@@ -2983,7 +2978,6 @@ static void set_carrier(struct r8152 *tp) ...@@ -2983,7 +2978,6 @@ static void set_carrier(struct r8152 *tp)
struct net_device *netdev = tp->netdev; struct net_device *netdev = tp->netdev;
u8 speed; u8 speed;
clear_bit(RTL8152_LINK_CHG, &tp->flags);
speed = rtl8152_get_speed(tp); speed = rtl8152_get_speed(tp);
if (speed & LINK_STATUS) { if (speed & LINK_STATUS) {
...@@ -3026,20 +3020,18 @@ static void rtl_work_func_t(struct work_struct *work) ...@@ -3026,20 +3020,18 @@ static void rtl_work_func_t(struct work_struct *work)
goto out1; goto out1;
} }
if (test_bit(RTL8152_LINK_CHG, &tp->flags)) if (test_and_clear_bit(RTL8152_LINK_CHG, &tp->flags))
set_carrier(tp); 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); _rtl8152_set_rx_mode(tp->netdev);
/* don't schedule napi before linking */ /* don't schedule napi before linking */
if (test_bit(SCHEDULE_NAPI, &tp->flags) && if (test_and_clear_bit(SCHEDULE_NAPI, &tp->flags) &&
netif_carrier_ok(tp->netdev)) { netif_carrier_ok(tp->netdev))
clear_bit(SCHEDULE_NAPI, &tp->flags);
napi_schedule(&tp->napi); napi_schedule(&tp->napi);
}
if (test_bit(PHY_RESET, &tp->flags)) if (test_and_clear_bit(PHY_RESET, &tp->flags))
rtl_phy_reset(tp); rtl_phy_reset(tp);
mutex_unlock(&tp->control); mutex_unlock(&tp->control);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment