| Message ID | 41518453.ApMFpK6n11@wuerfel (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 31, 2013 at 05:49:28PM +0200, Arnd Bergmann wrote: > The clocksource API has changed slightly, which causes a harmless > warning: > > /git/arm-soc/drivers/clocksource/nomadik-mtu.c:259:28: warning: 'nmdk_timer_match' defined but not used [-Wunused-variable] > static struct of_device_id nmdk_timer_match[] __initconst = { > ^ > > Fortunately, the same API change also lets us simplify the code > while removing the warning. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > I've applied this patch on top of next/dt to remove the warning introduced > by Linus' patch. I didn't see that make it to the repo though? Since you'd have to rebase anyway, I'll just apply it here and will include it with the other branch updates. -Olof
2013/5/31 Arnd Bergmann <arnd@arndb.de>: > The clocksource API has changed slightly, which causes a harmless > warning: > > /git/arm-soc/drivers/clocksource/nomadik-mtu.c:259:28: warning: 'nmdk_timer_match' defined but not used [-Wunused-variable] > static struct of_device_id nmdk_timer_match[] __initconst = { > ^ > > Fortunately, the same API change also lets us simplify the code > while removing the warning. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Ah so it matches the string directly in CLOCKSOURCE_OF_DECLARE() OK makes perfect sense, sometimes it's hard to keep up with the evolutional pace here... Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Saturday 01 June 2013, Olof Johansson wrote: > I didn't see that make it to the repo though? > > Since you'd have to rebase anyway, I'll just apply it here and will > include it with the other branch updates. > Thanks. I had applied it locally but then forgot to push it out. Arnd
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 7982cb0..b9415b6 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c @@ -256,23 +256,13 @@ void __init nmdk_timer_init(void __iomem *base, int irq) __nmdk_timer_init(base, irq, pclk0, clk0); } -static struct of_device_id nmdk_timer_match[] __initconst = { - { .compatible = "st,nomadik-mtu" }, - {} -}; - -static void __init nmdk_timer_of_init(void) +static void __init nmdk_timer_of_init(struct device_node *node) { - struct device_node *node; struct clk *pclk; struct clk *clk; void __iomem *base; int irq; - node = of_find_matching_node(NULL, nmdk_timer_match); - if (!node) - panic("No timer node"); - base = of_iomap(node, 0); if (!base) panic("Can't remap registers");
The clocksource API has changed slightly, which causes a harmless warning: /git/arm-soc/drivers/clocksource/nomadik-mtu.c:259:28: warning: 'nmdk_timer_match' defined but not used [-Wunused-variable] static struct of_device_id nmdk_timer_match[] __initconst = { ^ Fortunately, the same API change also lets us simplify the code while removing the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- I've applied this patch on top of next/dt to remove the warning introduced by Linus' patch.