linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] m68k/coldfire: change pll var. to clk_pll
@ 2021-07-04 23:01 Randy Dunlap
  2021-07-07 12:30 ` Greg Ungerer
  0 siblings, 1 reply; 4+ messages in thread
From: Randy Dunlap @ 2021-07-04 23:01 UTC (permalink / raw)
  To: linux-kernel
  Cc: Randy Dunlap, kernel test robot, Greg Ungerer, linux-m68k,
	uclinux-dev, Arnd Bergmann

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 <lkp@intel.com>
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: linux-m68k@lists.linux-m68k.org
Cc: uclinux-dev@uclinux.org
Cc: Arnd Bergmann <arnd@arndb.de>
---
 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),

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] m68k/coldfire: change pll var. to clk_pll
  2021-07-04 23:01 [PATCH] m68k/coldfire: change pll var. to clk_pll Randy Dunlap
@ 2021-07-07 12:30 ` Greg Ungerer
  2021-07-07 20:32   ` Arnd Bergmann
  0 siblings, 1 reply; 4+ messages in thread
From: Greg Ungerer @ 2021-07-07 12:30 UTC (permalink / raw)
  To: Randy Dunlap, linux-kernel
  Cc: kernel test robot, linux-m68k, uclinux-dev, Arnd Bergmann


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 <lkp@intel.com>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Greg Ungerer <gerg@linux-m68k.org>
> Cc: linux-m68k@lists.linux-m68k.org
> Cc: uclinux-dev@uclinux.org
> Cc: Arnd Bergmann <arnd@arndb.de>

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),
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] m68k/coldfire: change pll var. to clk_pll
  2021-07-07 12:30 ` Greg Ungerer
@ 2021-07-07 20:32   ` Arnd Bergmann
  2021-07-08  1:11     ` Greg Ungerer
  0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2021-07-07 20:32 UTC (permalink / raw)
  To: Greg Ungerer
  Cc: Randy Dunlap, Linux Kernel Mailing List, kernel test robot,
	linux-m68k, uclinux-dev

On Wed, Jul 7, 2021 at 2:30 PM Greg Ungerer <gerg@linux-m68k.org> 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 <lkp@intel.com>
> > Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> > Cc: Greg Ungerer <gerg@linux-m68k.org>
> > Cc: linux-m68k@lists.linux-m68k.org
> > Cc: uclinux-dev@uclinux.org
> > Cc: Arnd Bergmann <arnd@arndb.de>
>
> 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

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] m68k/coldfire: change pll var. to clk_pll
  2021-07-07 20:32   ` Arnd Bergmann
@ 2021-07-08  1:11     ` Greg Ungerer
  0 siblings, 0 replies; 4+ messages in thread
From: Greg Ungerer @ 2021-07-08  1:11 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Randy Dunlap, Linux Kernel Mailing List, kernel test robot,
	linux-m68k, uclinux-dev


On 8/7/21 6:32 am, Arnd Bergmann wrote:
> On Wed, Jul 7, 2021 at 2:30 PM Greg Ungerer <gerg@linux-m68k.org> 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 <lkp@intel.com>
>>> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
>>> Cc: Greg Ungerer <gerg@linux-m68k.org>
>>> Cc: linux-m68k@lists.linux-m68k.org
>>> Cc: uclinux-dev@uclinux.org
>>> Cc: Arnd Bergmann <arnd@arndb.de>
>>
>> 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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-07-08  1:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-04 23:01 [PATCH] m68k/coldfire: change pll var. to clk_pll Randy Dunlap
2021-07-07 12:30 ` Greg Ungerer
2021-07-07 20:32   ` Arnd Bergmann
2021-07-08  1:11     ` Greg Ungerer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).