diff options
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 3514de25d6c1..dcb6fedf8380 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -2318,34 +2318,28 @@ static void rtl8125_config_eee_mac(struct rtl8169_private *tp) r8168_mac_ocp_modify(tp, 0xeb62, 0, BIT(2) | BIT(1)); } -static void rtl8168f_config_eee_phy(struct rtl8169_private *tp) +static void rtl8168f_config_eee_phy(struct phy_device *phydev) { - struct phy_device *phydev = tp->phydev; - r8168d_modify_extpage(phydev, 0x0020, 0x15, 0, BIT(8)); r8168d_phy_param(phydev, 0x8b85, 0, BIT(13)); } -static void rtl8168g_config_eee_phy(struct rtl8169_private *tp) +static void rtl8168g_config_eee_phy(struct phy_device *phydev) { - phy_modify_paged(tp->phydev, 0x0a43, 0x11, 0, BIT(4)); + phy_modify_paged(phydev, 0x0a43, 0x11, 0, BIT(4)); } -static void rtl8168h_config_eee_phy(struct rtl8169_private *tp) +static void rtl8168h_config_eee_phy(struct phy_device *phydev) { - struct phy_device *phydev = tp->phydev; - - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); phy_modify_paged(phydev, 0xa4a, 0x11, 0x0000, 0x0200); phy_modify_paged(phydev, 0xa42, 0x14, 0x0000, 0x0080); } -static void rtl8125_config_eee_phy(struct rtl8169_private *tp) +static void rtl8125_config_eee_phy(struct phy_device *phydev) { - struct phy_device *phydev = tp->phydev; - - rtl8168h_config_eee_phy(tp); + rtl8168h_config_eee_phy(phydev); phy_modify_paged(phydev, 0xa6d, 0x12, 0x0001, 0x0000); phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000); @@ -2954,7 +2948,7 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp, /* Improve 2-pair detection performance */ r8168d_phy_param(phydev, 0x8b85, 0x0000, 0x4000); - rtl8168f_config_eee_phy(tp); + rtl8168f_config_eee_phy(phydev); /* Green feature */ rtl_writephy(tp, 0x1f, 0x0003); @@ -2979,7 +2973,7 @@ static void rtl8168f_hw_phy_config(struct rtl8169_private *tp, /* Improve 10M EEE waveform */ r8168d_phy_param(phydev, 0x8b86, 0x0000, 0x0001); - rtl8168f_config_eee_phy(tp); + rtl8168f_config_eee_phy(phydev); } static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp, @@ -3124,14 +3118,14 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp, rtl_writephy(tp, 0x1f, 0x0000); rtl8168g_disable_aldps(tp); - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); } static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp, struct phy_device *phydev) { rtl_apply_firmware(tp); - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); } static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp, @@ -3197,7 +3191,7 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0x0a44, 0x11, BIT(7), 0); rtl8168g_disable_aldps(tp); - rtl8168h_config_eee_phy(tp); + rtl8168h_config_eee_phy(phydev); } static u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp) @@ -3251,7 +3245,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0x0a44, 0x11, BIT(7), 0); rtl8168g_disable_aldps(tp); - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); } static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp, @@ -3272,7 +3266,7 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0x0c42, 0x11, BIT(13), BIT(14)); rtl8168g_disable_aldps(tp); - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); } static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp, @@ -3322,7 +3316,7 @@ static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp, rtl_writephy(tp, 0x1f, 0x0000); rtl8168g_disable_aldps(tp); - rtl8168g_config_eee_phy(tp); + rtl8168g_config_eee_phy(phydev); } static void rtl8117_hw_phy_config(struct rtl8169_private *tp, @@ -3360,7 +3354,7 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp, r8168g_phy_param(phydev, 0x8016, 0x0000, 0x0400); rtl8168g_disable_aldps(tp); - rtl8168h_config_eee_phy(tp); + rtl8168h_config_eee_phy(phydev); } static void rtl8102e_hw_phy_config(struct rtl8169_private *tp, @@ -3469,7 +3463,7 @@ static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xa5c, 0x10, 0x0400, 0x0000); phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800); - rtl8125_config_eee_phy(tp); + rtl8125_config_eee_phy(phydev); } static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp, @@ -3534,7 +3528,7 @@ static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp, phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000); phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800); - rtl8125_config_eee_phy(tp); + rtl8125_config_eee_phy(phydev); } static void r8169_hw_phy_config(struct rtl8169_private *tp, |