OSDN Git Service

phy: qcom-qmp-combo: disable runtime PM on unbind
authorJohan Hovold <johan+linaro@kernel.org>
Wed, 7 Sep 2022 11:07:13 +0000 (13:07 +0200)
committerVinod Koul <vkoul@kernel.org>
Tue, 20 Sep 2022 05:58:07 +0000 (11:28 +0530)
Make sure to disable runtime PM also on driver unbind.

Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM").
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220907110728.19092-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/phy/qualcomm/phy-qcom-qmp-combo.c

index af608c4..9ce2ab5 100644 (file)
@@ -2930,7 +2930,9 @@ static int qcom_qmp_phy_combo_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
+       ret = devm_pm_runtime_enable(dev);
+       if (ret)
+               return ret;
        /*
         * Prevent runtime pm from being ON by default. Users can enable
         * it using power/control in sysfs.
@@ -2987,13 +2989,10 @@ static int qcom_qmp_phy_combo_probe(struct platform_device *pdev)
        phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
        if (!IS_ERR(phy_provider))
                dev_info(dev, "Registered Qcom-QMP phy\n");
-       else
-               pm_runtime_disable(dev);
 
        return PTR_ERR_OR_ZERO(phy_provider);
 
 err_node_put:
-       pm_runtime_disable(dev);
        of_node_put(child);
        return ret;
 }