Commit 8f1c7160 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phy: remove genphy_c45_eee_is_active()'s is_enabled arg 



All callers to genphy_c45_eee_is_active() now pass NULL as the
is_enabled argument, which means we never use the value computed
in this function. Remove the argument and clean up this function.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/E1tJ9JC-006LIt-Ne@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 92f7acb8

drivers/net/phy/phy-c45.c

+4 −8
Original line number Diff line number Diff line
@@ -1469,18 +1469,17 @@ EXPORT_SYMBOL_GPL(genphy_c45_plca_get_status); 
 * @phydev: target phy_device struct

 * @adv: variable to store advertised linkmodes

 * @lp: variable to store LP advertised linkmodes

 * @is_enabled: variable to store EEE enabled/disabled configuration value

 *

 * Description: this function will read local and link partner PHY

 * advertisements. Compare them return current EEE state.

 */

int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *adv,

			     unsigned long *lp, bool *is_enabled)

			     unsigned long *lp)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp_adv) = {};

	__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp_lp) = {};

	__ETHTOOL_DECLARE_LINK_MODE_MASK(common);

	bool eee_enabled, eee_active;

	bool eee_active;

	int ret;



	ret = genphy_c45_read_eee_adv(phydev, tmp_adv);
@@ -1491,9 +1490,8 @@ int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *adv, 
	if (ret)

		return ret;



	eee_enabled = !linkmode_empty(tmp_adv);

	linkmode_and(common, tmp_adv, tmp_lp);

	if (eee_enabled && !linkmode_empty(common))

	if (!linkmode_empty(tmp_adv) && !linkmode_empty(common))

		eee_active = phy_check_valid(phydev->speed, phydev->duplex,

					     common);

	else
@@ -1503,8 +1501,6 @@ int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *adv, 
		linkmode_copy(adv, tmp_adv);

	if (lp)

		linkmode_copy(lp, tmp_lp);

	if (is_enabled)

		*is_enabled = eee_enabled;



	return eee_active;

}
@@ -1524,7 +1520,7 @@ int genphy_c45_ethtool_get_eee(struct phy_device *phydev, 
	int ret;



	ret = genphy_c45_eee_is_active(phydev, data->advertised,

				       data->lp_advertised, NULL);

				       data->lp_advertised);

	if (ret < 0)

		return ret;

drivers/net/phy/phy.c

+2 −3
Original line number Diff line number Diff line
@@ -988,8 +988,7 @@ static int phy_check_link_status(struct phy_device *phydev) 
	if (phydev->link && phydev->state != PHY_RUNNING) {

		phy_check_downshift(phydev);

		phydev->state = PHY_RUNNING;

		err = genphy_c45_eee_is_active(phydev,

					       NULL, NULL, NULL);

		err = genphy_c45_eee_is_active(phydev, NULL, NULL);

		phydev->eee_active = err > 0;

		phydev->enable_tx_lpi = phydev->eee_cfg.tx_lpi_enabled &&

					phydev->eee_active;
@@ -1658,7 +1657,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable) 
	if (!phydev->drv)

		return -EIO;



	ret = genphy_c45_eee_is_active(phydev, NULL, NULL, NULL);

	ret = genphy_c45_eee_is_active(phydev, NULL, NULL);

	if (ret < 0)

		return ret;

	if (!ret)

include/linux/phy.h

+1 −1
Original line number Diff line number Diff line
@@ -1991,7 +1991,7 @@ int genphy_c45_plca_set_cfg(struct phy_device *phydev, 
int genphy_c45_plca_get_status(struct phy_device *phydev,

			       struct phy_plca_status *plca_st);

int genphy_c45_eee_is_active(struct phy_device *phydev, unsigned long *adv,

			     unsigned long *lp, bool *is_enabled);

			     unsigned long *lp);

int genphy_c45_ethtool_get_eee(struct phy_device *phydev,

			       struct ethtool_keee *data);

int genphy_c45_ethtool_set_eee(struct phy_device *phydev,