generic: ar8216: move ar8xxx_id_chip into ar8xxx_phy_probe
authorChuanhong Guo <gch981213@gmail.com>
Thu, 10 Jan 2019 06:54:56 +0000 (14:54 +0800)
committerPetr Štetiar <ynezz@true.cz>
Sun, 24 Mar 2019 00:44:25 +0000 (01:44 +0100)
ar8xxx_id_chip is used to determine current ar8xxx_chip using switch
id and this isn't needed during mdiodev probing.
Move it out of ar8xxx_probe_switch so that we can skip it.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
target/linux/generic/files/drivers/net/phy/ar8216.c

index 10bdf523531b1655188487dc29f4b905e171d60b..b8cc2c8f4c2155b3a0c2c25a7bfdfafe41e0d4d6 100644 (file)
@@ -1975,10 +1975,6 @@ ar8xxx_probe_switch(struct ar8xxx_priv *priv)
        struct switch_dev *swdev;
        int ret;
 
-       ret = ar8xxx_id_chip(priv);
-       if (ret)
-               return ret;
-
        chip = priv->chip;
 
        swdev = &priv->dev;
@@ -2208,6 +2204,10 @@ ar8xxx_phy_probe(struct phy_device *phydev)
        priv->mii_bus = phydev->mdio.bus;
        priv->pdev = &phydev->mdio.dev;
 
+       ret = ar8xxx_id_chip(priv);
+       if (ret)
+               goto free_priv;
+
        ret = ar8xxx_probe_switch(priv);
        if (ret)
                goto free_priv;