1 From 4e3c021fb995bcbb5d1f814d00584cb80eb904a8 Mon Sep 17 00:00:00 2001
2 From: Krzysztof Kozlowski <k.kozlowski@samsung.com>
3 Date: Mon, 5 Jan 2015 10:52:40 +0100
4 Subject: [PATCH] clk: Add clk_unregister_{divider, gate, mux} to close memory
7 The common clk_register_{divider,gate,mux} functions allocated memory
8 for internal data which wasn't freed anywhere. Drivers using these
9 helpers could only unregister clocks but the memory would still leak.
11 Add corresponding unregister functions which will release all resources.
13 Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
14 Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
15 Signed-off-by: Michael Turquette <mturquette@linaro.org>
17 drivers/clk/clk-divider.c | 16 ++++++++++++++++
18 drivers/clk/clk-gate.c | 16 ++++++++++++++++
19 drivers/clk/clk-mux.c | 16 ++++++++++++++++
20 include/linux/clk-provider.h | 4 ++++
21 4 files changed, 52 insertions(+)
23 --- a/drivers/clk/clk-divider.c
24 +++ b/drivers/clk/clk-divider.c
25 @@ -463,3 +463,19 @@ struct clk *clk_register_divider_table(s
26 width, clk_divider_flags, table, lock);
28 EXPORT_SYMBOL_GPL(clk_register_divider_table);
30 +void clk_unregister_divider(struct clk *clk)
32 + struct clk_divider *div;
35 + hw = __clk_get_hw(clk);
39 + div = to_clk_divider(hw);
41 + clk_unregister(clk);
44 +EXPORT_SYMBOL_GPL(clk_unregister_divider);
45 --- a/drivers/clk/clk-gate.c
46 +++ b/drivers/clk/clk-gate.c
47 @@ -162,3 +162,19 @@ struct clk *clk_register_gate(struct dev
50 EXPORT_SYMBOL_GPL(clk_register_gate);
52 +void clk_unregister_gate(struct clk *clk)
54 + struct clk_gate *gate;
57 + hw = __clk_get_hw(clk);
61 + gate = to_clk_gate(hw);
63 + clk_unregister(clk);
66 +EXPORT_SYMBOL_GPL(clk_unregister_gate);
67 --- a/drivers/clk/clk-mux.c
68 +++ b/drivers/clk/clk-mux.c
69 @@ -177,3 +177,19 @@ struct clk *clk_register_mux(struct devi
72 EXPORT_SYMBOL_GPL(clk_register_mux);
74 +void clk_unregister_mux(struct clk *clk)
76 + struct clk_mux *mux;
79 + hw = __clk_get_hw(clk);
83 + mux = to_clk_mux(hw);
85 + clk_unregister(clk);
88 +EXPORT_SYMBOL_GPL(clk_unregister_mux);
89 --- a/include/linux/clk-provider.h
90 +++ b/include/linux/clk-provider.h
91 @@ -294,6 +294,7 @@ struct clk *clk_register_gate(struct dev
92 const char *parent_name, unsigned long flags,
93 void __iomem *reg, u8 bit_idx,
94 u8 clk_gate_flags, spinlock_t *lock);
95 +void clk_unregister_gate(struct clk *clk);
97 struct clk_div_table {
99 @@ -361,6 +362,7 @@ struct clk *clk_register_divider_table(s
100 void __iomem *reg, u8 shift, u8 width,
101 u8 clk_divider_flags, const struct clk_div_table *table,
103 +void clk_unregister_divider(struct clk *clk);
106 * struct clk_mux - multiplexer clock
107 @@ -414,6 +416,8 @@ struct clk *clk_register_mux_table(struc
108 void __iomem *reg, u8 shift, u32 mask,
109 u8 clk_mux_flags, u32 *table, spinlock_t *lock);
111 +void clk_unregister_mux(struct clk *clk);
113 void of_fixed_factor_clk_setup(struct device_node *node);