Messages in this thread | | | Date | Thu, 28 Nov 2019 10:56:30 -0800 | From | Bjorn Andersson <> | Subject | Re: [PATCH v1] clk: Convert managed get functions to devm_add_action API |
| |
On Tue 26 Nov 08:13 PST 2019, Marc Gonzalez wrote:
> Date: Tue, 26 Nov 2019 13:56:53 +0100 > > Using devm_add_action_or_reset() produces simpler code and smaller > object size: > > 1 file changed, 16 insertions(+), 46 deletions(-) > > text data bss dec hex filename > - 1797 80 0 1877 755 drivers/clk/clk-devres.o > + 1499 56 0 1555 613 drivers/clk/clk-devres.o > > Signed-off-by: Marc Gonzalez <marc.w.gonzalez@free.fr>
Looks neat
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards, Bjorn
> --- > drivers/clk/clk-devres.c | 62 +++++++++++----------------------------- > 1 file changed, 16 insertions(+), 46 deletions(-) > > diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c > index be160764911b..04379c1f203e 100644 > --- a/drivers/clk/clk-devres.c > +++ b/drivers/clk/clk-devres.c > @@ -4,31 +4,29 @@ > #include <linux/export.h> > #include <linux/gfp.h> > > -static void devm_clk_release(struct device *dev, void *res) > +static void __clk_put(void *clk) > { > - clk_put(*(struct clk **)res); > + clk_put(clk); > } > > struct clk *devm_clk_get(struct device *dev, const char *id) > { > - struct clk **ptr, *clk; > + struct clk *clk = clk_get(dev, id); > > - ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); > - if (!ptr) > - return ERR_PTR(-ENOMEM); > - > - clk = clk_get(dev, id); > - if (!IS_ERR(clk)) { > - *ptr = clk; > - devres_add(dev, ptr); > - } else { > - devres_free(ptr); > - } > + if (!IS_ERR(clk)) > + if (devm_add_action_or_reset(dev, __clk_put, clk)) > + clk = ERR_PTR(-ENOMEM); > > return clk; > } > EXPORT_SYMBOL(devm_clk_get); > > +void devm_clk_put(struct device *dev, struct clk *clk) > +{ > + devm_release_action(dev, __clk_put, clk); > +} > +EXPORT_SYMBOL(devm_clk_put); > + > struct clk *devm_clk_get_optional(struct device *dev, const char *id) > { > struct clk *clk = devm_clk_get(dev, id); > @@ -116,42 +114,14 @@ int __must_check devm_clk_bulk_get_all(struct device *dev, > } > EXPORT_SYMBOL_GPL(devm_clk_bulk_get_all); > > -static int devm_clk_match(struct device *dev, void *res, void *data) > -{ > - struct clk **c = res; > - if (!c || !*c) { > - WARN_ON(!c || !*c); > - return 0; > - } > - return *c == data; > -} > - > -void devm_clk_put(struct device *dev, struct clk *clk) > -{ > - int ret; > - > - ret = devres_release(dev, devm_clk_release, devm_clk_match, clk); > - > - WARN_ON(ret); > -} > -EXPORT_SYMBOL(devm_clk_put); > - > struct clk *devm_get_clk_from_child(struct device *dev, > struct device_node *np, const char *con_id) > { > - struct clk **ptr, *clk; > - > - ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); > - if (!ptr) > - return ERR_PTR(-ENOMEM); > + struct clk *clk = of_clk_get_by_name(np, con_id); > > - clk = of_clk_get_by_name(np, con_id); > - if (!IS_ERR(clk)) { > - *ptr = clk; > - devres_add(dev, ptr); > - } else { > - devres_free(ptr); > - } > + if (!IS_ERR(clk)) > + if (devm_add_action_or_reset(dev, __clk_put, clk)) > + clk = ERR_PTR(-ENOMEM); > > return clk; > } > -- > 2.17.1
| |