Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8afbc97 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-marvell10g-Clean-get_features-by-using-C45-helpers' 



Maxime Chevallier says:

====================
net: phy: marvell10g: Clean .get_features by using C45 helpers

Recent work on C45 helpers by Heiner made the
genphy_c45_pma_read_abilities function generic enough to use as a
default .get_featutes implementation.

This series removes the remaining redundant code in
mv3310_get_features(), and makes the 2110 PHY use
genphy_c45_pma_read_abilities() directly, since it doesn't have the
issue with the wrong abilities being reported.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 87750d17 41e2a99f

drivers/net/phy/marvell10g.c

+1 −11
Original line number Diff line number Diff line
@@ -268,16 +268,6 @@ static int mv3310_get_features(struct phy_device *phydev) 
{

	int ret, val;



	if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {

		val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);

		if (val < 0)

			return val;



		if (val & MDIO_AN_STAT1_ABLE)

			linkmode_set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

					 phydev->supported);

	}



	ret = genphy_c45_pma_read_abilities(phydev);

	if (ret)

		return ret;
@@ -482,7 +472,7 @@ static struct phy_driver mv3310_drivers[] = { 
		.phy_id		= MARVELL_PHY_ID_88E2110,

		.phy_id_mask	= MARVELL_PHY_ID_MASK,

		.name		= "mv88x2110",

		.features	= PHY_10GBIT_FEATURES,

		.get_features	= genphy_c45_pma_read_abilities,

		.probe		= mv3310_probe,

		.soft_reset	= gen10g_no_soft_reset,

		.config_init	= mv3310_config_init,