From: Arnd Bergmann Date: Fri, 31 May 2013 15:49:28 +0000 (+0200) Subject: ARM: nomadik: fix clocksource warning X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3c09f4daeee83b76779dec766f57e9e883402bb1;p=linux-beck.git ARM: nomadik: fix clocksource warning 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 Signed-off-by: Olof Johansson --- diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index 7982cb0f25f2..b9415b622f55 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");