diff options
author | Arnd Bergmann <arnd@arndb.de> | 2013-05-31 11:49:28 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-06-01 02:47:11 -0400 |
commit | 3c09f4daeee83b76779dec766f57e9e883402bb1 (patch) | |
tree | 086920b1b437316d7d92f916e32809de856147b9 /drivers/clocksource/nomadik-mtu.c | |
parent | d1ba78cd72190020b493369cfbd04f18198527bd (diff) |
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 <arnd@arndb.de>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/clocksource/nomadik-mtu.c')
-rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 12 |
1 files changed, 1 insertions, 11 deletions
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) | |||
256 | __nmdk_timer_init(base, irq, pclk0, clk0); | 256 | __nmdk_timer_init(base, irq, pclk0, clk0); |
257 | } | 257 | } |
258 | 258 | ||
259 | static struct of_device_id nmdk_timer_match[] __initconst = { | 259 | static void __init nmdk_timer_of_init(struct device_node *node) |
260 | { .compatible = "st,nomadik-mtu" }, | ||
261 | {} | ||
262 | }; | ||
263 | |||
264 | static void __init nmdk_timer_of_init(void) | ||
265 | { | 260 | { |
266 | struct device_node *node; | ||
267 | struct clk *pclk; | 261 | struct clk *pclk; |
268 | struct clk *clk; | 262 | struct clk *clk; |
269 | void __iomem *base; | 263 | void __iomem *base; |
270 | int irq; | 264 | int irq; |
271 | 265 | ||
272 | node = of_find_matching_node(NULL, nmdk_timer_match); | ||
273 | if (!node) | ||
274 | panic("No timer node"); | ||
275 | |||
276 | base = of_iomap(node, 0); | 266 | base = of_iomap(node, 0); |
277 | if (!base) | 267 | if (!base) |
278 | panic("Can't remap registers"); | 268 | panic("Can't remap registers"); |