aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-08-17 12:34:50 -0700
committerDavid S. Miller <davem@davemloft.net>2019-08-17 12:34:50 -0700
commit59d0f749bf3e6fea1ba3f9860ccf8b9ae7b3bb0e (patch)
tree9bb548f6da088ffdad8a3f31e33d5e4b203a7507 /net
parentipvlan: set hw_enc_features like macvlan (diff)
parentnet: phy: remove genphy_config_init (diff)
downloadlinux-59d0f749bf3e6fea1ba3f9860ccf8b9ae7b3bb0e.tar.gz
linux-59d0f749bf3e6fea1ba3f9860ccf8b9ae7b3bb0e.zip
Merge branch 'net-phy-remove-genphy_config_init'
Heiner Kallweit says: ==================== net: phy: remove genphy_config_init Supported PHY features are either auto-detected or explicitly set. In both cases calling genphy_config_init isn't needed. All that genphy_config_init does is removing features that are set as supported but can't be auto-detected. Basically it duplicates the code in genphy_read_abilities. Therefore remove genphy_config_init. v2: - remove call also from new adin driver v3: - pass NULL as config_init function pointer for dp83848 ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dsa/port.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c
index f071acf2842b..f75301456430 100644
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -538,10 +538,6 @@ static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
return PTR_ERR(phydev);
if (enable) {
- err = genphy_config_init(phydev);
- if (err < 0)
- goto err_put_dev;
-
err = genphy_resume(phydev);
if (err < 0)
goto err_put_dev;
@@ -589,7 +585,6 @@ static int dsa_port_fixed_link_register_of(struct dsa_port *dp)
mode = PHY_INTERFACE_MODE_NA;
phydev->interface = mode;
- genphy_config_init(phydev);
genphy_read_status(phydev);
if (ds->ops->adjust_link)