Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94c51f40 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

qcom: clk: Make qcom_cc_probe() fully devm safe 



Some APIs in qcom_cc_probe() don't have a devm counterpart, so we
have to use the calling device's platform data to pass pointers
to the remove path. Let's use devm_add_action() instead, so that
the remove path doesn't need to do anything, allowing us to
remove qcom_cc_remove() entirely.

Cc: Rajendra Nayak <rnayak@codeaurora.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 0829ea5a

drivers/clk/qcom/common.c

+24 −11
Original line number Diff line number Diff line
@@ -73,6 +73,21 @@ qcom_cc_map(struct platform_device *pdev, const struct qcom_cc_desc *desc) 
}

EXPORT_SYMBOL_GPL(qcom_cc_map);



static void qcom_cc_del_clk_provider(void *data)

{

	of_clk_del_provider(data);

}



static void qcom_cc_reset_unregister(void *data)

{

	reset_controller_unregister(data);

}



static void qcom_cc_gdsc_unregister(void *data)

{

	gdsc_unregister(data);

}



int qcom_cc_really_probe(struct platform_device *pdev,

			 const struct qcom_cc_desc *desc, struct regmap *regmap)

{
@@ -111,6 +126,8 @@ int qcom_cc_really_probe(struct platform_device *pdev, 
	if (ret)

		return ret;



	devm_add_action(dev, qcom_cc_del_clk_provider, pdev->dev.of_node);



	reset = &cc->reset;

	reset->rcdev.of_node = dev->of_node;

	reset->rcdev.ops = &qcom_reset_ops;
@@ -118,25 +135,24 @@ int qcom_cc_really_probe(struct platform_device *pdev, 
	reset->rcdev.nr_resets = desc->num_resets;

	reset->regmap = regmap;

	reset->reset_map = desc->resets;

	platform_set_drvdata(pdev, &reset->rcdev);



	ret = reset_controller_register(&reset->rcdev);

	if (ret)

		goto err_reset;

		return ret;



	devm_add_action(dev, qcom_cc_reset_unregister, &reset->rcdev);



	if (desc->gdscs && desc->num_gdscs) {

		ret = gdsc_register(dev, desc->gdscs, desc->num_gdscs,

				    &reset->rcdev, regmap);

		if (ret)

			goto err_pd;

			return ret;

	}



	devm_add_action(dev, qcom_cc_gdsc_unregister, dev);





	return 0;

err_pd:

	reset_controller_unregister(&reset->rcdev);

err_reset:

	of_clk_del_provider(dev->of_node);

	return ret;

}

EXPORT_SYMBOL_GPL(qcom_cc_really_probe);
@@ -154,9 +170,6 @@ EXPORT_SYMBOL_GPL(qcom_cc_probe); 


void qcom_cc_remove(struct platform_device *pdev)

{

	gdsc_unregister(&pdev->dev);

	of_clk_del_provider(pdev->dev.of_node);

	reset_controller_unregister(platform_get_drvdata(pdev));

}

EXPORT_SYMBOL_GPL(qcom_cc_remove);