Commit 5860bb1c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Jakub Kicinski
Browse files

net: phy: fixed_phy: remove setting supported/advertised modes from fixed_phy_register 



This code was added with 34b31da4 ("phy: fixed_phy: Set supported
speed in phydev") 10 yrs ago. The commit message of this change
mentions a use case involving callback adjust_link of struct
dsa_switch_driver. This struct doesn't exist any longer, and in general
usage of the legacy fixed PHY has been removed from DSA with the switch
to phylink.

Note: Supported and advertised modes are now set by phy_probe() when
the fixed PHY is attached to the netdev and bound to the genphy driver.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Link: https://patch.msgid.link/3abaa3c5-fbb9-4052-9346-6cb096a25878@gmail.com


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

drivers/net/phy/fixed_phy.c

+0 −24
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/of.h>

#include <linux/idr.h>

#include <linux/netdevice.h>

#include <linux/linkmode.h>



#include "swphy.h"
@@ -184,29 +183,6 @@ struct phy_device *fixed_phy_register(const struct fixed_phy_status *status, 
	phy->mdio.dev.of_node = np;

	phy->is_pseudo_fixed_link = true;



	switch (status->speed) {

	case SPEED_1000:

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT,

				 phy->supported);

		linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

				 phy->supported);

		fallthrough;

	case SPEED_100:

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,

				 phy->supported);

		linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

				 phy->supported);

		fallthrough;

	case SPEED_10:

	default:

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,

				 phy->supported);

		linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,

				 phy->supported);

	}



	phy_advertise_supported(phy);



	ret = phy_device_register(phy);

	if (ret) {

		phy_device_free(phy);