Re: [PATCH v2 1/3] clk: avoid devm_clk_release name clash

[Stephen Boyd]

Quoting Jerome Brunet (2020-10-21 09:21:45)
> In clk-devres.c, devm_clk_release() is used to call clk_put() memory
> managed clock. In clk.c the same name, in a different scope is used to call
> clk_unregister().
> 
> As it stands, it is not really a problem but it does not readability,
> especially if we need to call clk_put() on managed clock in clk.c
> 
> Signed-off-by: Jerome Brunet 
> ---

Applied to clk-next

[PATCH v2 1/3] clk: avoid devm_clk_release name clash

[Jerome Brunet]

In clk-devres.c, devm_clk_release() is used to call clk_put() memory
managed clock. In clk.c the same name, in a different scope is used to call
clk_unregister().

As it stands, it is not really a problem but it does not readability,
especially if we need to call clk_put() on managed clock in clk.c

Signed-off-by: Jerome Brunet 
---
 drivers/clk/clk.c | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 0a9261a099bd..88e5797bb6b4 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -4068,12 +4068,12 @@ void clk_hw_unregister(struct clk_hw *hw)
 }
 EXPORT_SYMBOL_GPL(clk_hw_unregister);
 
-static void devm_clk_release(struct device *dev, void *res)
+static void devm_clk_unregister_cb(struct device *dev, void *res)
 {
clk_unregister(*(struct clk **)res);
 }
 
-static void devm_clk_hw_release(struct device *dev, void *res)
+static void devm_clk_hw_unregister_cb(struct device *dev, void *res)
 {
clk_hw_unregister(*(struct clk_hw **)res);
 }
@@ -4093,7 +4093,7 @@ struct clk *devm_clk_register(struct device *dev, struct 
clk_hw *hw)
struct clk *clk;
struct clk **clkp;
 
-   clkp = devres_alloc(devm_clk_release, sizeof(*clkp), GFP_KERNEL);
+   clkp = devres_alloc(devm_clk_unregister_cb, sizeof(*clkp), GFP_KERNEL);
if (!clkp)
return ERR_PTR(-ENOMEM);
 
@@ -4123,7 +4123,7 @@ int devm_clk_hw_register(struct device *dev, struct 
clk_hw *hw)
struct clk_hw **hwp;
int ret;
 
-   hwp = devres_alloc(devm_clk_hw_release, sizeof(*hwp), GFP_KERNEL);
+   hwp = devres_alloc(devm_clk_hw_unregister_cb, sizeof(*hwp), GFP_KERNEL);
if (!hwp)
return -ENOMEM;
 
@@ -4167,7 +4167,7 @@ static int devm_clk_hw_match(struct device *dev, void 
*res, void *data)
  */
 void devm_clk_unregister(struct device *dev, struct clk *clk)
 {
-   WARN_ON(devres_release(dev, devm_clk_release, devm_clk_match, clk));
+   WARN_ON(devres_release(dev, devm_clk_unregister_cb, devm_clk_match, 
clk));
 }
 EXPORT_SYMBOL_GPL(devm_clk_unregister);
 
@@ -4182,7 +4182,7 @@ EXPORT_SYMBOL_GPL(devm_clk_unregister);
  */
 void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw)
 {
-   WARN_ON(devres_release(dev, devm_clk_hw_release, devm_clk_hw_match,
+   WARN_ON(devres_release(dev, devm_clk_hw_unregister_cb, 
devm_clk_hw_match,
hw));
 }
 EXPORT_SYMBOL_GPL(devm_clk_hw_unregister);
-- 
2.25.4