diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-01-09 20:32:36 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-10 16:41:35 -0800 |
| commit | 00b522d1ebaffa66f17203f2b610a0aa4d16a900 (patch) | |
| tree | 5e9c34bd6a2c0176a06123691b9f3d708979d7a4 | |
| parent | r8169: use phy_read/write instead of rtl_readphy/writephy (diff) | |
| download | linux-dev-00b522d1ebaffa66f17203f2b610a0aa4d16a900.tar.xz linux-dev-00b522d1ebaffa66f17203f2b610a0aa4d16a900.zip | |
r8169: add phydev argument to rtl8168d_apply_firmware_cond
Pass the phy_device as parameter to rtl8168d_apply_firmware_cond(),
this avoids having to access rtl8169_private internals.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 595659c2b76e..e022f555153d 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2669,9 +2669,10 @@ static const struct phy_reg rtl8168d_1_phy_reg_init_1[] = { { 0x1f, 0x0002 } }; -static void rtl8168d_apply_firmware_cond(struct rtl8169_private *tp, u16 val) +static void rtl8168d_apply_firmware_cond(struct rtl8169_private *tp, + struct phy_device *phydev, + u16 val) { - struct phy_device *phydev = tp->phydev; u16 reg_val; phy_write(phydev, 0x1f, 0x0005); @@ -2734,7 +2735,7 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp, phy_clear_bits(phydev, 0x03, 0xe000); phy_write(phydev, 0x1f, 0x0000); - rtl8168d_apply_firmware_cond(tp, 0xbf00); + rtl8168d_apply_firmware_cond(tp, phydev, 0xbf00); } static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp, @@ -2775,7 +2776,7 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp, /* Switching regulator Slew rate */ phy_modify_paged(phydev, 0x0002, 0x0f, 0x0000, 0x0017); - rtl8168d_apply_firmware_cond(tp, 0xb300); + rtl8168d_apply_firmware_cond(tp, phydev, 0xb300); } static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp, |