diff options
| author |   hayeswang <hayeswang@realtek.com> | 2016-07-07 15:09:18 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-09 17:48:05 -0400 |
| commit | b1648066b41f01057e2b802f71410bddae8dce45 (patch) | |
| tree | 700c0c27929220393dca804ac8a93310173a3e7c /drivers/net/usb | |
| parent | Merge branch 'mpls-in-ipv4-and-udp' (diff) | |
| download | linux-dev-b1648066b41f01057e2b802f71410bddae8dce45.tar.xz linux-dev-b1648066b41f01057e2b802f71410bddae8dce45.zip | |
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) } } -static void rtl_phy_reset(struct r8152 *tp) -{ - u16 data; - int i; - - data = r8152_mdio_read(tp, MII_BMCR); - - /* don't reset again before the previous one complete */ - if (data & BMCR_RESET) - return; - - data |= BMCR_RESET; - r8152_mdio_write(tp, MII_BMCR, data); - - for (i = 0; i < 50; i++) { - msleep(20); - if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0) - break; - } -} - static void r8153_teredo_off(struct r8152 *tp) { u32 ocp_data; @@ -3069,9 +3048,6 @@ static void rtl_work_func_t(struct work_struct *work) netif_carrier_ok(tp->netdev)) napi_schedule(&tp->napi); - if (test_and_clear_bit(PHY_RESET, &tp->flags)) - rtl_phy_reset(tp); - mutex_unlock(&tp->control); out1: |