phy: core: Check requested PHY status in _of_phy_get()

This is a common checking in various drivers, so move the checking to
_of_phy_get().

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 5f729bb0788ff276fe5868b3a9d4164186eca0cd..7d535dbb63ee7aec55460aed5fb059c858ac8acc 100644 (file)
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -367,13 +367,21 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
        phy_provider = of_phy_provider_lookup(args.np);
        if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) {
                phy = ERR_PTR(-EPROBE_DEFER);
-               goto err0;
+               goto out_unlock;
+       }
+
+       if (!of_device_is_available(args.np)) {
+               dev_warn(phy_provider->dev, "Requested PHY is disabled\n");
+               phy = ERR_PTR(-ENODEV);
+               goto out_put_module;
        }
 
        phy = phy_provider->of_xlate(phy_provider->dev, &args);
+
+out_put_module:
        module_put(phy_provider->owner);
 
-err0:
+out_unlock:
        mutex_unlock(&phy_provider_mutex);
        of_node_put(args.np);
 

diff --git a/drivers/phy/phy-miphy28lp.c b/drivers/phy/phy-miphy28lp.c
index 58d5339ff44873d480e0a45e659c56a8d49c51d5..5e257ef7ac050a55bc09d6ce853aa6d2a37cf52e 100644 (file)
--- a/drivers/phy/phy-miphy28lp.c
+++ b/drivers/phy/phy-miphy28lp.c
@@ -1107,11 +1107,6 @@ static struct phy *miphy28lp_xlate(struct device *dev,
        struct device_node *phynode = args->np;
        int ret, index = 0;
 
-       if (!of_device_is_available(phynode)) {
-               dev_warn(dev, "Requested PHY is disabled\n");
-               return ERR_PTR(-ENODEV);
-       }
-
        if (args->args_count != 1) {
                dev_err(dev, "Invalid number of cells in 'phy' property\n");
                return ERR_PTR(-EINVAL);

diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c
index ba6993da91fe0624d4c188b86c71020f60ccaf86..0ff354d6e1831b3f9a970ae8d6f30a4c0fa466da 100644 (file)
--- a/drivers/phy/phy-miphy365x.c
+++ b/drivers/phy/phy-miphy365x.c
@@ -476,11 +476,6 @@ static struct phy *miphy365x_xlate(struct device *dev,
        struct device_node *phynode = args->np;
        int ret, index;
 
-       if (!of_device_is_available(phynode)) {
-               dev_warn(dev, "Requested PHY is disabled\n");
-               return ERR_PTR(-ENODEV);
-       }
-
        if (args->args_count != 1) {
                dev_err(dev, "Invalid number of cells in 'phy' property\n");
                return ERR_PTR(-EINVAL);

diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c
index 778276aba3aa0092d8e8e7bc2de15eae4f5a5a15..f47bfd8a5368e909d2989cb9a35555807c279211 100644 (file)
--- a/drivers/phy/phy-rcar-gen2.c
+++ b/drivers/phy/phy-rcar-gen2.c
@@ -206,11 +206,6 @@ static struct phy *rcar_gen2_phy_xlate(struct device *dev,
        struct device_node *np = args->np;
        int i;
 
-       if (!of_device_is_available(np)) {
-               dev_warn(dev, "Requested PHY is disabled\n");
-               return ERR_PTR(-ENODEV);
-       }
-
        drv = dev_get_drvdata(dev);
        if (!drv)
                return ERR_PTR(-EINVAL);