Skip to content

Commit

Permalink
clk: sunxi: factors: Add unregister function
Browse files Browse the repository at this point in the history
sunxi's factors clk did not have an unregister function. This means
multiple structs were leaked whenever a factors clk was unregistered.

Add an unregister function for it. Also keep pointers to the mux and
gate structs so they can be freed.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  • Loading branch information
Chen-Yu Tsai authored and Maxime Ripard committed Jan 27, 2016
1 parent 78ca95c commit 4cbeaeb
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
25 changes: 25 additions & 0 deletions drivers/clk/sunxi/clk-factors.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,8 @@ struct clk *sunxi_factors_register(struct device_node *node,
if (!gate)
goto err_gate;

factors->gate = gate;

/* set up gate properties */
gate->reg = reg;
gate->bit_idx = data->enable;
Expand All @@ -215,6 +217,8 @@ struct clk *sunxi_factors_register(struct device_node *node,
if (!mux)
goto err_mux;

factors->mux = mux;

/* set up gate properties */
mux->reg = reg;
mux->shift = data->mux;
Expand Down Expand Up @@ -255,3 +259,24 @@ struct clk *sunxi_factors_register(struct device_node *node,
err_factors:
return NULL;
}

void sunxi_factors_unregister(struct device_node *node, struct clk *clk)
{
struct clk_hw *hw = __clk_get_hw(clk);
struct clk_factors *factors;
const char *name;

if (!hw)
return;

factors = to_clk_factors(hw);
name = clk_hw_get_name(hw);

/* No unregister call for clkdev_* */
of_clk_del_provider(node);
/* TODO: The composite clock stuff will leak a bit here. */
clk_unregister(clk);
kfree(factors->mux);
kfree(factors->gate);
kfree(factors);
}
5 changes: 5 additions & 0 deletions drivers/clk/sunxi/clk-factors.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,16 @@ struct clk_factors {
const struct clk_factors_config *config;
void (*get_factors) (u32 *rate, u32 parent, u8 *n, u8 *k, u8 *m, u8 *p);
spinlock_t *lock;
/* for cleanup */
struct clk_mux *mux;
struct clk_gate *gate;
};

struct clk *sunxi_factors_register(struct device_node *node,
const struct factors_data *data,
spinlock_t *lock,
void __iomem *reg);

void sunxi_factors_unregister(struct device_node *node, struct clk *clk);

#endif

0 comments on commit 4cbeaeb

Please sign in to comment.