diff options
author | hayeswang <hayeswang@realtek.com> | 2016-07-07 03:09:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-09 17:48:05 -0400 |
commit | b1648066b41f01057e2b802f71410bddae8dce45 (patch) | |
tree | 700c0c27929220393dca804ac8a93310173a3e7c /drivers/net/usb | |
parent | fb577316b7600adda2aa479cc1d52eb3f95073d5 (diff) |
r8152: remove rtl_phy_reset function
In rtl_hw_phy_work_func_t(), the flag of PHY_RESET is set in
rtl_ops.hw_phy_cfg() and cleared in rtl8152_set_speed(). Therefore,
the rtl_phy_reset() is never run and is unnecessary.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/r8152.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index b225bc27fbe2..e005ee648efe 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c | |||
@@ -2450,27 +2450,6 @@ static void rtl8153_runtime_enable(struct r8152 *tp, bool enable) | |||
2450 | } | 2450 | } |
2451 | } | 2451 | } |
2452 | 2452 | ||
2453 | static void rtl_phy_reset(struct r8152 *tp) | ||
2454 | { | ||
2455 | u16 data; | ||
2456 | int i; | ||
2457 | |||
2458 | data = r8152_mdio_read(tp, MII_BMCR); | ||
2459 | |||
2460 | /* don't reset again before the previous one complete */ | ||
2461 | if (data & BMCR_RESET) | ||
2462 | return; | ||
2463 | |||
2464 | data |= BMCR_RESET; | ||
2465 | r8152_mdio_write(tp, MII_BMCR, data); | ||
2466 | |||
2467 | for (i = 0; i < 50; i++) { | ||
2468 | msleep(20); | ||
2469 | if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0) | ||
2470 | break; | ||
2471 | } | ||
2472 | } | ||
2473 | |||
2474 | static void r8153_teredo_off(struct r8152 *tp) | 2453 | static void r8153_teredo_off(struct r8152 *tp) |
2475 | { | 2454 | { |
2476 | u32 ocp_data; | 2455 | u32 ocp_data; |
@@ -3069,9 +3048,6 @@ static void rtl_work_func_t(struct work_struct *work) | |||
3069 | netif_carrier_ok(tp->netdev)) | 3048 | netif_carrier_ok(tp->netdev)) |
3070 | napi_schedule(&tp->napi); | 3049 | napi_schedule(&tp->napi); |
3071 | 3050 | ||
3072 | if (test_and_clear_bit(PHY_RESET, &tp->flags)) | ||
3073 | rtl_phy_reset(tp); | ||
3074 | |||
3075 | mutex_unlock(&tp->control); | 3051 | mutex_unlock(&tp->control); |
3076 | 3052 | ||
3077 | out1: | 3053 | out1: |