Commit 00b522d1 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ab077d2

drivers/net/ethernet/realtek/r8169_main.c

+5 −4
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE