[v2,1/1] clk: Remove never used devm_clk_*unregister()

Commit Message

Andy Shevchenko June 22, 2022, 5:11 p.m. UTC

For the entire history of the devm_clk_*unregister() existence they were
used only once (*) in 2015. Remove them.

*) The commit 264e3b75de4e ("clk: s2mps11: Simplify s2mps11_clk_probe unwind
   paths") exactly supports the point of the change proposed here.

Signed-off-by: Andy Shevchenko <[e-mail]>
---
v2: removed now unused match() functions as well
 drivers/clk/clk.c            | 48 ------------------------------------
 include/linux/clk-provider.h |  2 --
 2 files changed, 50 deletions(-)

Comments

Uwe Kleine-König June 22, 2022, 5:24 p.m. UTC | #1

Hello,

On Wed, Jun 22, 2022 at 08:11:47PM +0300, Andy Shevchenko wrote:
> For the entire history of the devm_clk_*unregister() existence they were
> used only once (*) in 2015. Remove them.
> 
> *) The commit 264e3b75de4e ("clk: s2mps11: Simplify s2mps11_clk_probe unwind
>    paths") exactly supports the point of the change proposed here.
> 
> Signed-off-by: Andy Shevchenko <[e-mail]>

Nice

Acked-by: Uwe Kleine-König <[e-mail]>

Best regards
Uwe

Stephen Boyd June 22, 2022, 11:14 p.m. UTC | #2

Quoting Andy Shevchenko (2022-06-22 10:11:47)
> For the entire history of the devm_clk_*unregister() existence they were
> used only once (*) in 2015. Remove them.
> 
> *) The commit 264e3b75de4e ("clk: s2mps11: Simplify s2mps11_clk_probe unwind
>    paths") exactly supports the point of the change proposed here.
> 
> Signed-off-by: Andy Shevchenko <[e-mail]>
> ---

Applied to clk-next

Patch

diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index f00d4c1158d7..7fc191c15507 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -4279,54 +4279,6 @@  int devm_clk_hw_register(struct device *dev, struct clk_hw *hw)
 }
 EXPORT_SYMBOL_GPL(devm_clk_hw_register);
 
-static int devm_clk_match(struct device *dev, void *res, void *data)
-{
-	struct clk *c = res;
-	if (WARN_ON(!c))
-		return 0;
-	return c == data;
-}
-
-static int devm_clk_hw_match(struct device *dev, void *res, void *data)
-{
-	struct clk_hw *hw = res;
-
-	if (WARN_ON(!hw))
-		return 0;
-	return hw == data;
-}
-
-/**
- * devm_clk_unregister - resource managed clk_unregister()
- * @dev: device that is unregistering the clock data
- * @clk: clock to unregister
- *
- * Deallocate a clock allocated with devm_clk_register(). Normally
- * this function will not need to be called and the resource management
- * code will ensure that the resource is freed.
- */
-void devm_clk_unregister(struct device *dev, struct clk *clk)
-{
-	WARN_ON(devres_release(dev, devm_clk_unregister_cb, devm_clk_match, clk));
-}
-EXPORT_SYMBOL_GPL(devm_clk_unregister);
-
-/**
- * devm_clk_hw_unregister - resource managed clk_hw_unregister()
- * @dev: device that is unregistering the hardware-specific clock data
- * @hw: link to hardware-specific clock data
- *
- * Unregister a clk_hw registered with devm_clk_hw_register(). Normally
- * this function will not need to be called and the resource management
- * code will ensure that the resource is freed.
- */
-void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw)
-{
-	WARN_ON(devres_release(dev, devm_clk_hw_unregister_cb, devm_clk_hw_match,
-				hw));
-}
-EXPORT_SYMBOL_GPL(devm_clk_hw_unregister);
-
 static void devm_clk_release(struct device *dev, void *res)
 {
 	clk_put(*(struct clk **)res);
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index c10dc4c659e2..72d937c03a3e 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -1176,10 +1176,8 @@  int __must_check devm_clk_hw_register(struct device *dev, struct clk_hw *hw);
 int __must_check of_clk_hw_register(struct device_node *node, struct clk_hw *hw);
 
 void clk_unregister(struct clk *clk);
-void devm_clk_unregister(struct device *dev, struct clk *clk);
 
 void clk_hw_unregister(struct clk_hw *hw);
-void devm_clk_hw_unregister(struct device *dev, struct clk_hw *hw);
 
 /* helper functions */
 const char *__clk_get_name(const struct clk *clk);