2021-07-04 23:02:46

by Randy Dunlap

Subject: [PATCH] m68k/coldfire: change pll var. to clk_pll

DEFINE_CLK() makes the variable name be clk_xyz, so variable
'pll' should instead be 'clk_pll'.

In file included from ../arch/m68k/coldfire/m525x.c:12:
../arch/m68k/coldfire/m525x.c:29:30: error: 'pll' undeclared here (not in a function)
29 | CLKDEV_INIT(NULL, "pll.0", &pll),
| ^~~
../include/linux/clkdev.h:30:10: note: in definition of macro 'CLKDEV_INIT'
30 | .clk = c, \
| ^
In file included from ../arch/m68k/coldfire/m525x.c:21:
../arch/m68k/include/asm/mcfclk.h:43:27: warning: 'clk_pll' defined but not used [-Wunused-variable]
43 | static struct clk clk_##clk_ref = { \
| ^~~~
../arch/m68k/coldfire/m525x.c:25:1: note: in expansion of macro 'DEFINE_CLK'
25 | DEFINE_CLK(pll, "pll.0", MCF_CLK);
| ^~~~~~~~~~

Fixes: 63aadb77669a ("m68k: coldfire: use clkdev_lookup on most coldfire")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Greg Ungerer <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: Arnd Bergmann <[email protected]>
---
arch/m68k/coldfire/m525x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20210701.orig/arch/m68k/coldfire/m525x.c
+++ linux-next-20210701/arch/m68k/coldfire/m525x.c
@@ -26,7 +26,7 @@ DEFINE_CLK(pll, "pll.0", MCF_CLK);
DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);

static struct clk_lookup m525x_clk_lookup[] = {
- CLKDEV_INIT(NULL, "pll.0", &pll),
+ CLKDEV_INIT(NULL, "pll.0", &clk_pll),
CLKDEV_INIT(NULL, "sys.0", &clk_sys),
CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),

2021-07-07 12:36:04

by Greg Ungerer

Subject: Re: [PATCH] m68k/coldfire: change pll var. to clk_pll

On 5/7/21 9:01 am, Randy Dunlap wrote:
> DEFINE_CLK() makes the variable name be clk_xyz, so variable
> 'pll' should instead be 'clk_pll'.
>
> In file included from ../arch/m68k/coldfire/m525x.c:12:
> ../arch/m68k/coldfire/m525x.c:29:30: error: 'pll' undeclared here (not in a function)
> 29 | CLKDEV_INIT(NULL, "pll.0", &pll),
> | ^~~
> ../include/linux/clkdev.h:30:10: note: in definition of macro 'CLKDEV_INIT'
> 30 | .clk = c, \
> | ^
> In file included from ../arch/m68k/coldfire/m525x.c:21:
> ../arch/m68k/include/asm/mcfclk.h:43:27: warning: 'clk_pll' defined but not used [-Wunused-variable]
> 43 | static struct clk clk_##clk_ref = { \
> | ^~~~
> ../arch/m68k/coldfire/m525x.c:25:1: note: in expansion of macro 'DEFINE_CLK'
> 25 | DEFINE_CLK(pll, "pll.0", MCF_CLK);
> | ^~~~~~~~~~
>
> Fixes: 63aadb77669a ("m68k: coldfire: use clkdev_lookup on most coldfire")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Greg Ungerer <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: Arnd Bergmann <[email protected]>

Thanks Randy.

Arnd: since this has hit mainline do you want me to pick it up
in the m68knommu git tree and push to Linus from there?

Regards
Greg



> ---
> arch/m68k/coldfire/m525x.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20210701.orig/arch/m68k/coldfire/m525x.c
> +++ linux-next-20210701/arch/m68k/coldfire/m525x.c
> @@ -26,7 +26,7 @@ DEFINE_CLK(pll, "pll.0", MCF_CLK);
> DEFINE_CLK(sys, "sys.0", MCF_BUSCLK);
>
> static struct clk_lookup m525x_clk_lookup[] = {
> - CLKDEV_INIT(NULL, "pll.0", &pll),
> + CLKDEV_INIT(NULL, "pll.0", &clk_pll),
> CLKDEV_INIT(NULL, "sys.0", &clk_sys),
> CLKDEV_INIT("mcftmr.0", NULL, &clk_sys),
> CLKDEV_INIT("mcftmr.1", NULL, &clk_sys),
>

2021-07-07 20:43:45

by Arnd Bergmann

Subject: Re: [PATCH] m68k/coldfire: change pll var. to clk_pll

On Wed, Jul 7, 2021 at 2:30 PM Greg Ungerer <[email protected]> wrote:
> On 5/7/21 9:01 am, Randy Dunlap wrote:
> > DEFINE_CLK() makes the variable name be clk_xyz, so variable
> > 'pll' should instead be 'clk_pll'.
> >
> > In file included from ../arch/m68k/coldfire/m525x.c:12:
> > ../arch/m68k/coldfire/m525x.c:29:30: error: 'pll' undeclared here (not in a function)
> > 29 | CLKDEV_INIT(NULL, "pll.0", &pll),
> > | ^~~
> > ../include/linux/clkdev.h:30:10: note: in definition of macro 'CLKDEV_INIT'
> > 30 | .clk = c, \
> > | ^
> > In file included from ../arch/m68k/coldfire/m525x.c:21:
> > ../arch/m68k/include/asm/mcfclk.h:43:27: warning: 'clk_pll' defined but not used [-Wunused-variable]
> > 43 | static struct clk clk_##clk_ref = { \
> > | ^~~~
> > ../arch/m68k/coldfire/m525x.c:25:1: note: in expansion of macro 'DEFINE_CLK'
> > 25 | DEFINE_CLK(pll, "pll.0", MCF_CLK);
> > | ^~~~~~~~~~
> >
> > Fixes: 63aadb77669a ("m68k: coldfire: use clkdev_lookup on most coldfire")
> > Reported-by: kernel test robot <[email protected]>
> > Signed-off-by: Randy Dunlap <[email protected]>
> > Cc: Greg Ungerer <[email protected]>
> > Cc: [email protected]
> > Cc: [email protected]
> > Cc: Arnd Bergmann <[email protected]>
>
> Thanks Randy.
>
> Arnd: since this has hit mainline do you want me to pick it up
> in the m68knommu git tree and push to Linus from there?

Yes, that would be good. Sorry I completely missed the bug report and the
earlier fix.

Arnd

2021-07-08 01:14:20

by Greg Ungerer

Subject: Re: [PATCH] m68k/coldfire: change pll var. to clk_pll

On 8/7/21 6:32 am, Arnd Bergmann wrote:
> On Wed, Jul 7, 2021 at 2:30 PM Greg Ungerer <[email protected]> wrote:
>> On 5/7/21 9:01 am, Randy Dunlap wrote:
>>> DEFINE_CLK() makes the variable name be clk_xyz, so variable
>>> 'pll' should instead be 'clk_pll'.
>>>
>>> In file included from ../arch/m68k/coldfire/m525x.c:12:
>>> ../arch/m68k/coldfire/m525x.c:29:30: error: 'pll' undeclared here (not in a function)
>>> 29 | CLKDEV_INIT(NULL, "pll.0", &pll),
>>> | ^~~
>>> ../include/linux/clkdev.h:30:10: note: in definition of macro 'CLKDEV_INIT'
>>> 30 | .clk = c, \
>>> | ^
>>> In file included from ../arch/m68k/coldfire/m525x.c:21:
>>> ../arch/m68k/include/asm/mcfclk.h:43:27: warning: 'clk_pll' defined but not used [-Wunused-variable]
>>> 43 | static struct clk clk_##clk_ref = { \
>>> | ^~~~
>>> ../arch/m68k/coldfire/m525x.c:25:1: note: in expansion of macro 'DEFINE_CLK'
>>> 25 | DEFINE_CLK(pll, "pll.0", MCF_CLK);
>>> | ^~~~~~~~~~
>>>
>>> Fixes: 63aadb77669a ("m68k: coldfire: use clkdev_lookup on most coldfire")
>>> Reported-by: kernel test robot <[email protected]>
>>> Signed-off-by: Randy Dunlap <[email protected]>
>>> Cc: Greg Ungerer <[email protected]>
>>> Cc: [email protected]
>>> Cc: [email protected]
>>> Cc: Arnd Bergmann <[email protected]>
>>
>> Thanks Randy.
>>
>> Arnd: since this has hit mainline do you want me to pick it up
>> in the m68knommu git tree and push to Linus from there?
>
> Yes, that would be good. Sorry I completely missed the bug report and the
> earlier fix.

No worries. I'll take care of it.

Regards
Greg