From 5a3a479dae11dd16ad0b754ae798fc083db3b3aa Mon Sep 17 00:00:00 2001 From: Andrey Panov Date: Wed, 4 Mar 2015 23:11:34 +0300 Subject: CLK: clk-divider: Introduce clk_divider_alloc() and *_free() routines Signed-off-by: Andrey Panov Signed-off-by: Sascha Hauer --- drivers/clk/clk-divider.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'drivers/clk') diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index eb4833441a..cedcddaabd 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -212,11 +212,10 @@ struct clk_ops clk_divider_ops = { .round_rate = clk_divider_round_rate, }; -struct clk *clk_divider(const char *name, const char *parent, +struct clk *clk_divider_alloc(const char *name, const char *parent, void __iomem *reg, u8 shift, u8 width, unsigned flags) { struct clk_divider *div = xzalloc(sizeof(*div)); - int ret; div->shift = shift; div->reg = reg; @@ -228,13 +227,31 @@ struct clk *clk_divider(const char *name, const char *parent, div->clk.parent_names = &div->parent; div->clk.num_parents = 1; - ret = clk_register(&div->clk); + return &div->clk; +} + +void clk_divider_free(struct clk *clk) +{ + struct clk_divider *d = container_of(clk, struct clk_divider, clk); + + free(d); +} + +struct clk *clk_divider(const char *name, const char *parent, + void __iomem *reg, u8 shift, u8 width, unsigned flags) +{ + struct clk *d; + int ret; + + d = clk_divider_alloc(name , parent, reg, shift, width, flags); + + ret = clk_register(d); if (ret) { - free(div); + clk_divider_free(d); return ERR_PTR(ret); } - return &div->clk; + return d; } struct clk *clk_divider_one_based(const char *name, const char *parent, -- cgit v1.2.3