[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <6378088.D2hhHiJIV0@wuerfel>
Date: Thu, 21 Jul 2016 14:54:42 +0200
From: Arnd Bergmann <arnd@...db.de>
To: Daniel Lezcano <daniel.lezcano@...aro.org>
Cc: linux-arm-kernel@...ts.infradead.org, Wan Zongshun <vw@...mu.org>,
devicetree@...r.kernel.org, jason@...edaemon.net,
Wan Zongshun <mcuos.com@...il.com>,
linux-kernel@...r.kernel.org, Russell King <linux@...linux.org.uk>,
p.zabel@...gutronix.de, Thomas Gleixner <tglx@...utronix.de>,
linux-clk@...r.kernel.org
Subject: Re: [PATCH v2 03/10] Clocksource: add nuc970 clocksource driver
On Thursday, July 21, 2016 2:52:24 PM CEST Daniel Lezcano wrote:
> On Tue, Jul 12, 2016 at 10:28:35AM +0200, Arnd Bergmann wrote:
>
> [ ... ]
>
> > > > Also the init function has changed its return type in linux-next:
> > > >
> > > >> +static void __init nuc970_timer_of_init(struct device_node *node)
> > > >
> > > > This now needs to return an error code or we get:
> > > >
> > > > ../include/linux/of.h:1004:20: error: comparison of distinct pointer types lacks a cast [-Werror]
> > > > .data = (fn == (fn_type)NULL) ? fn : fn }
> > > >
> > > > Daniel Lezcano seems to have implemented a migration strategy, but I
> > > > can't see what you are supposed to do here, since the
> > > > CLOCKSOURCE_OF_DECLARE_RET macro is no longer part of linux-next.
> > >
> > > Wait for Daniel's comments? or what should I do now?
> >
> > Yes, let's see what he says. I guess from the timing, this will probably
> > have to wait for linux-4.9 anyway, and then we have no problem because the
> > API change will make it into 4.8.
>
> CLOCKSOURCE_OF_DECLARE_RET was renamed back to CLOCKSOURCE_OF_DECLARE but it
> expects now an init function returning an 'int'.
>
> These changes are now in tip/timers/core, so in linux-next.
Ok, so the driver could be merged on top of that, but it's really
late for 4.8 now, so we'd just wait until after the merge window
anyway.
Arnd
Powered by blists - more mailing lists