Commit 7635622b authored by Douglas Anderson's avatar Douglas Anderson Committed by Stephen Boyd
Browse files

clk: qcom: lpasscc-sc7810: Use devm in probe 



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: default avatarDouglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20201019154857.v5.1.I4567b5e7e17bbb15ef063d447cb83fd43746cb18@changeid


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 15d09e83

drivers/clk/qcom/lpasscorecc-sc7180.c

+21 −17
Original line number Diff line number Diff line
@@ -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 -EINVAL;



	return 0;



destroy_pm_clk:

	pm_clk_destroy(&pdev->dev);



disable_pm_runtime:

	pm_runtime_disable(&pdev->dev);



	return ret;

	return clk_probe(pdev);

}



static const struct dev_pm_ops lpass_core_cc_pm_ops = {