| Message ID | E1YSTnW-0001Jk-Tm@rmk-PC.arm.linux.org.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 2, 2015 at 6:06 PM, Russell King <rmk+kernel@arm.linux.org.uk> wrote: > --- a/include/linux/clkdev.h > +++ b/include/linux/clkdev.h > @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, > void clkdev_add(struct clk_lookup *cl); > void clkdev_drop(struct clk_lookup *cl); > > +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, > + const char *dev_fmt, ...); __printf(3, 4) While you're at it, can you please also add the __printf attribute to clkdev_alloc() and clk_register_clkdev()? Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, Mar 02, 2015 at 06:22:31PM +0100, Geert Uytterhoeven wrote: > On Mon, Mar 2, 2015 at 6:06 PM, Russell King > <rmk+kernel@arm.linux.org.uk> wrote: > > --- a/include/linux/clkdev.h > > +++ b/include/linux/clkdev.h > > @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, > > void clkdev_add(struct clk_lookup *cl); > > void clkdev_drop(struct clk_lookup *cl); > > > > +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, > > + const char *dev_fmt, ...); > > __printf(3, 4) > > While you're at it, can you please also add the __printf attribute to > clkdev_alloc() and clk_register_clkdev()? What's the behaviour of __printf() with a NULL format string? The clkdev interfaces permit that, normal printf() doesn't.
On 03/02/15 09:06, Russell King wrote: > Add a helper to allocate and add a clk_lookup structure. This can not > only be used in several places in clkdev.c to simplify the code, but > more importantly, can be used by callers of the clkdev code to simplify > their clkdev creation and registration. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ > include/linux/clkdev.h | 3 +++ > 2 files changed, 43 insertions(+), 12 deletions(-) > > diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c > index 043fd3633373..611b9acbad78 100644 > --- a/drivers/clk/clkdev.c > +++ b/drivers/clk/clkdev.c > @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, > return &cla->cl; > } > > +static struct clk_lookup * > +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, > + va_list ap) > +{ > + struct clk_lookup *cl; > + > + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); > + if (cl) > + clkdev_add(cl); > + > + return cl; > +} > + > struct clk_lookup * __init_refok > clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) > { > @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) > } > EXPORT_SYMBOL(clkdev_alloc); > > +/** > + * clkdev_create - allocate and add a clkdev lookup structure > + * @clk: struct clk to associate with all clk_lookups > + * @con_id: connection ID string on device > + * @dev_fmt: format string describing device name > + * > + * Returns a clk_lookup structure, which can be later unregistered and > + * freed. And returns NULL on failure? Any reason why we don't return an error pointer on failure?
On Mon, Mar 2, 2015 at 6:46 PM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Mon, Mar 02, 2015 at 06:22:31PM +0100, Geert Uytterhoeven wrote: >> On Mon, Mar 2, 2015 at 6:06 PM, Russell King >> <rmk+kernel@arm.linux.org.uk> wrote: >> > --- a/include/linux/clkdev.h >> > +++ b/include/linux/clkdev.h >> > @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, >> > void clkdev_add(struct clk_lookup *cl); >> > void clkdev_drop(struct clk_lookup *cl); >> > >> > +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, >> > + const char *dev_fmt, ...); >> >> __printf(3, 4) >> >> While you're at it, can you please also add the __printf attribute to >> clkdev_alloc() and clk_register_clkdev()? > > What's the behaviour of __printf() with a NULL format string? The > clkdev interfaces permit that, normal printf() doesn't. As expected: no warning. Verified with gcc 4.1.2 and 4.8.2. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
On Mon, Mar 02, 2015 at 11:07:58AM -0800, Stephen Boyd wrote: > On 03/02/15 09:06, Russell King wrote: > > Add a helper to allocate and add a clk_lookup structure. This can not > > only be used in several places in clkdev.c to simplify the code, but > > more importantly, can be used by callers of the clkdev code to simplify > > their clkdev creation and registration. > > > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > > --- > > drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ > > include/linux/clkdev.h | 3 +++ > > 2 files changed, 43 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c > > index 043fd3633373..611b9acbad78 100644 > > --- a/drivers/clk/clkdev.c > > +++ b/drivers/clk/clkdev.c > > @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, > > return &cla->cl; > > } > > > > +static struct clk_lookup * > > +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, > > + va_list ap) > > +{ > > + struct clk_lookup *cl; > > + > > + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); > > + if (cl) > > + clkdev_add(cl); > > + > > + return cl; > > +} > > + > > struct clk_lookup * __init_refok > > clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) > > { > > @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) > > } > > EXPORT_SYMBOL(clkdev_alloc); > > > > +/** > > + * clkdev_create - allocate and add a clkdev lookup structure > > + * @clk: struct clk to associate with all clk_lookups > > + * @con_id: connection ID string on device > > + * @dev_fmt: format string describing device name > > + * > > + * Returns a clk_lookup structure, which can be later unregistered and > > + * freed. > > And returns NULL on failure? Any reason why we don't return an error > pointer on failure? Why should it when it's only error is "no memory" ? It follows the clkdev_alloc() and memory allocator pattern. It'd also make the error handling in places like clk_add_alias() more difficult (how that happened, I don't know...) though that could probably be fixed as no one seems to bother checking the return value... maybe that's a reason to make it return void ;)
On 03/02/15 13:01, Russell King - ARM Linux wrote: > On Mon, Mar 02, 2015 at 11:07:58AM -0800, Stephen Boyd wrote: >> On 03/02/15 09:06, Russell King wrote: >>> Add a helper to allocate and add a clk_lookup structure. This can not >>> only be used in several places in clkdev.c to simplify the code, but >>> more importantly, can be used by callers of the clkdev code to simplify >>> their clkdev creation and registration. >>> >>> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> >>> --- >>> drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ >>> include/linux/clkdev.h | 3 +++ >>> 2 files changed, 43 insertions(+), 12 deletions(-) >>> >>> diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c >>> index 043fd3633373..611b9acbad78 100644 >>> --- a/drivers/clk/clkdev.c >>> +++ b/drivers/clk/clkdev.c >>> @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, >>> return &cla->cl; >>> } >>> >>> +static struct clk_lookup * >>> +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, >>> + va_list ap) >>> +{ >>> + struct clk_lookup *cl; >>> + >>> + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); >>> + if (cl) >>> + clkdev_add(cl); >>> + >>> + return cl; >>> +} >>> + >>> struct clk_lookup * __init_refok >>> clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) >>> { >>> @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) >>> } >>> EXPORT_SYMBOL(clkdev_alloc); >>> >>> +/** >>> + * clkdev_create - allocate and add a clkdev lookup structure >>> + * @clk: struct clk to associate with all clk_lookups >>> + * @con_id: connection ID string on device >>> + * @dev_fmt: format string describing device name >>> + * >>> + * Returns a clk_lookup structure, which can be later unregistered and >>> + * freed. >> And returns NULL on failure? Any reason why we don't return an error >> pointer on failure? > Why should it when it's only error is "no memory" ? It follows the > clkdev_alloc() and memory allocator pattern. > > It'd also make the error handling in places like clk_add_alias() more > difficult (how that happened, I don't know...) though that could probably > be fixed as no one seems to bother checking the return value... maybe > that's a reason to make it return void ;) > Ok, fair enough. Right now clk_add_alias() leaks if a driver decides to add an alias and then fail probe for something like probe deferral. We should probably make that return the clk_lookup structure too so that drivers can clean up.
diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 043fd3633373..611b9acbad78 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -294,6 +294,19 @@ vclkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, return &cla->cl; } +static struct clk_lookup * +vclkdev_create((struct clk *clk, const char *con_id, const char *dev_fmt, + va_list ap) +{ + struct clk_lookup *cl; + + cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + if (cl) + clkdev_add(cl); + + return cl; +} + struct clk_lookup * __init_refok clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) { @@ -308,6 +321,28 @@ clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) } EXPORT_SYMBOL(clkdev_alloc); +/** + * clkdev_create - allocate and add a clkdev lookup structure + * @clk: struct clk to associate with all clk_lookups + * @con_id: connection ID string on device + * @dev_fmt: format string describing device name + * + * Returns a clk_lookup structure, which can be later unregistered and + * freed. + */ +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...) +{ + struct clk_lookup *cl; + va_list ap; + + va_start(ap, dev_fmt); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); + va_end(ap); + + return cl; +} + int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, struct device *dev) { @@ -317,12 +352,10 @@ int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, if (IS_ERR(r)) return PTR_ERR(r); - l = clkdev_alloc(r, alias, alias_dev_name); + l = vclkdev_create(r, alias, "%s", alias_dev_name); clk_put(r); - if (!l) - return -ENODEV; - clkdev_add(l); - return 0; + + return l ? 0 : -ENODEV; } EXPORT_SYMBOL(clk_add_alias); @@ -362,15 +395,10 @@ int clk_register_clkdev(struct clk *clk, const char *con_id, return PTR_ERR(clk); va_start(ap, dev_fmt); - cl = vclkdev_alloc(clk, con_id, dev_fmt, ap); + cl = vclkdev_create(clk, con_id, dev_fmt, ap); va_end(ap); - if (!cl) - return -ENOMEM; - - clkdev_add(cl); - - return 0; + return cl ? 0 : -ENOMEM; } EXPORT_SYMBOL(clk_register_clkdev); diff --git a/include/linux/clkdev.h b/include/linux/clkdev.h index 94bad77eeb4a..6f32f6d8b6ee 100644 --- a/include/linux/clkdev.h +++ b/include/linux/clkdev.h @@ -37,6 +37,9 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, void clkdev_add(struct clk_lookup *cl); void clkdev_drop(struct clk_lookup *cl); +struct clk_lookup *clkdev_create(struct clk *clk, const char *con_id, + const char *dev_fmt, ...); + void clkdev_add_table(struct clk_lookup *, size_t); int clk_add_alias(const char *, const char *, char *, struct device *);
Add a helper to allocate and add a clk_lookup structure. This can not only be used in several places in clkdev.c to simplify the code, but more importantly, can be used by callers of the clkdev code to simplify their clkdev creation and registration. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/clk/clkdev.c | 52 ++++++++++++++++++++++++++++++++++++++------------ include/linux/clkdev.h | 3 +++ 2 files changed, 43 insertions(+), 12 deletions(-)