Re: linux-next: build failure after merge of the clk tree
From: Stephen Boyd
Date: Fri Jul 12 2019 - 13:53:34 EST
Quoting Stephen Rothwell (2019-07-01 19:03:50)
> Hi all,
>
> On Tue, 2 Jul 2019 11:14:55 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> >
> > On Tue, 2 Jul 2019 10:01:03 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> > >
> > > We need something like this (untested):
> >
> > simple testing shows build errors ... we need something better.
>
> This at least passes my (few) build tests (this will be in linux-next
> today):
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 2 Jul 2019 11:53:07 +1000
> Subject: [PATCH] clk: consoldiate the __clk_get_hw() declarations
>
> Without this we were getting errors like:
>
> In file included from drivers/clk/clkdev.c:22:0:
> drivers/clk/clk.h:36:23: error: static declaration of '__clk_get_hw' follows non-static declaration
> include/linux/clk-provider.h:808:16: note: previous declaration of '__clk_get_hw' was here
>
> Fixes: 59fcdce425b7 ("clk: Remove ifdef for COMMON_CLK in clk-provider.h")
> fixes: 73e0e496afda ("clkdev: Always allocate a struct clk and call __clk_get() w/ CCF")
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Thanks for fixing this. I didn't run all the configs it seems.
I'll pull this into the clk pile now.