diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:39 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-11-14 10:07:39 -0800 |
commit | 2dd850ef6e1e525a06b4ba111968199a32844177 (patch) | |
tree | ee74051c65cf3dd2ed15446ffd9b4ba74216602f /drivers | |
parent | ed9c62f75aef10297fb6da4e24292fb354cb8307 (diff) | |
parent | b87206f8addc52b07e0aba30f8c8ee1a5093cfa9 (diff) | |
download | op-kernel-dev-2dd850ef6e1e525a06b4ba111968199a32844177.zip op-kernel-dev-2dd850ef6e1e525a06b4ba111968199a32844177.tar.gz |
Merge branch 'clk-devm-provider' into clk-next
* clk-devm-provider:
clk: qcom: common: Migrate to devm_* APIs for resets and clk providers
clk: Add devm_of_clk_add_hw_provider()/del_provider() APIs
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/clk.c | 52 | ||||
-rw-r--r-- | drivers/clk/qcom/common.c | 26 |
2 files changed, 54 insertions, 24 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index b6495a1..647d056 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -3275,6 +3275,37 @@ int of_clk_add_hw_provider(struct device_node *np, } EXPORT_SYMBOL_GPL(of_clk_add_hw_provider); +static void devm_of_clk_release_provider(struct device *dev, void *res) +{ + of_clk_del_provider(*(struct device_node **)res); +} + +int devm_of_clk_add_hw_provider(struct device *dev, + struct clk_hw *(*get)(struct of_phandle_args *clkspec, + void *data), + void *data) +{ + struct device_node **ptr, *np; + int ret; + + ptr = devres_alloc(devm_of_clk_release_provider, sizeof(*ptr), + GFP_KERNEL); + if (!ptr) + return -ENOMEM; + + np = dev->of_node; + ret = of_clk_add_hw_provider(np, get, data); + if (!ret) { + *ptr = np; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return ret; +} +EXPORT_SYMBOL_GPL(devm_of_clk_add_hw_provider); + /** * of_clk_del_provider() - Remove a previously registered clock provider * @np: Device node pointer associated with clock provider @@ -3296,6 +3327,27 @@ void of_clk_del_provider(struct device_node *np) } EXPORT_SYMBOL_GPL(of_clk_del_provider); +static int devm_clk_provider_match(struct device *dev, void *res, void *data) +{ + struct device_node **np = res; + + if (WARN_ON(!np || !*np)) + return 0; + + return *np == data; +} + +void devm_of_clk_del_provider(struct device *dev) +{ + int ret; + + ret = devres_release(dev, devm_of_clk_release_provider, + devm_clk_provider_match, dev->of_node); + + WARN_ON(ret); +} +EXPORT_SYMBOL(devm_of_clk_del_provider); + static struct clk_hw * __of_clk_get_hw_from_provider(struct of_clk_provider *provider, struct of_phandle_args *clkspec) diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index d523991..b35564c 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -111,16 +111,6 @@ qcom_pll_set_fsm_mode(struct regmap *map, u32 reg, u8 bias_count, u8 lock_count) } EXPORT_SYMBOL_GPL(qcom_pll_set_fsm_mode); -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); @@ -248,13 +238,7 @@ int qcom_cc_really_probe(struct platform_device *pdev, return ret; } - ret = of_clk_add_hw_provider(dev->of_node, qcom_cc_clk_hw_get, cc); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, qcom_cc_del_clk_provider, - pdev->dev.of_node); - + ret = devm_of_clk_add_hw_provider(dev, qcom_cc_clk_hw_get, cc); if (ret) return ret; @@ -266,13 +250,7 @@ int qcom_cc_really_probe(struct platform_device *pdev, reset->regmap = regmap; reset->reset_map = desc->resets; - ret = reset_controller_register(&reset->rcdev); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, qcom_cc_reset_unregister, - &reset->rcdev); - + ret = devm_reset_controller_register(dev, &reset->rcdev); if (ret) return ret; |