Messages in this thread | | | Subject | Re: [PATCH v5 1/2] clk: qcom: lpasscc-sc7810: Use devm in probe | From | Taniya Das <> | Date | Thu, 29 Oct 2020 14:32:16 +0530 |
| |
Reviewed-by: Taniya Das <tdas@codeaurora.org>
On 10/20/2020 4:19 AM, Douglas Anderson wrote: > Let's convert the lpass clock control driver to use devm. This is a > few more lines of code, but it will be useful in a later patch which > disentangles the two devices handled by this driver. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > (no changes since v4) > > Changes in v4: > - Fixed typo lapss => lpass > - Moved lpass_pm_runtime_disable() lpass_pm_clk_destroy() in file. > > Changes in v3: > - ("clk: qcom: lpasscc-sc7810: Use devm in probe") new for v3. > > drivers/clk/qcom/lpasscorecc-sc7180.c | 38 +++++++++++++++------------ > 1 file changed, 21 insertions(+), 17 deletions(-) > > diff --git a/drivers/clk/qcom/lpasscorecc-sc7180.c b/drivers/clk/qcom/lpasscorecc-sc7180.c > index 228d08f5d26f..2d15e33ec837 100644 > --- a/drivers/clk/qcom/lpasscorecc-sc7180.c > +++ b/drivers/clk/qcom/lpasscorecc-sc7180.c > @@ -356,6 +356,16 @@ static const struct qcom_cc_desc lpass_audio_hm_sc7180_desc = { > .num_gdscs = ARRAY_SIZE(lpass_audio_hm_sc7180_gdscs), > }; > > +static void lpass_pm_runtime_disable(void *data) > +{ > + pm_runtime_disable(data); > +} > + > +static void lpass_pm_clk_destroy(void *data) > +{ > + pm_clk_destroy(data); > +} > + > static int lpass_core_cc_sc7180_probe(struct platform_device *pdev) > { > const struct qcom_cc_desc *desc; > @@ -418,34 +428,28 @@ static int lpass_core_sc7180_probe(struct platform_device *pdev) > int ret; > > pm_runtime_enable(&pdev->dev); > + ret = devm_add_action_or_reset(&pdev->dev, lpass_pm_runtime_disable, &pdev->dev); > + if (ret) > + return ret; > + > ret = pm_clk_create(&pdev->dev); > if (ret) > - goto disable_pm_runtime; > + return ret; > + ret = devm_add_action_or_reset(&pdev->dev, lpass_pm_clk_destroy, &pdev->dev); > + if (ret) > + return ret; > > ret = pm_clk_add(&pdev->dev, "iface"); > if (ret < 0) { > dev_err(&pdev->dev, "failed to acquire iface clock\n"); > - goto destroy_pm_clk; > + return ret; > } > > - ret = -EINVAL; > clk_probe = of_device_get_match_data(&pdev->dev); > if (!clk_probe) > - goto destroy_pm_clk; > - > - ret = clk_probe(pdev); > - if (ret) > - goto destroy_pm_clk; > - > - return 0; > - > -destroy_pm_clk: > - pm_clk_destroy(&pdev->dev); > - > -disable_pm_runtime: > - pm_runtime_disable(&pdev->dev); > + return -EINVAL; > > - return ret; > + return clk_probe(pdev); > } > > static const struct dev_pm_ops lpass_core_cc_pm_ops = { >
-- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation.
--
| |