diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-05-31 17:49:28 +0200 |
|---|---|---|
| committer |   Olof Johansson <olof@lixom.net> | 2013-05-31 23:47:11 -0700 |
| commit | 3c09f4daeee83b76779dec766f57e9e883402bb1 (patch) | |
| tree | 086920b1b437316d7d92f916e32809de856147b9 /drivers/clocksource | |
| parent | Merge tag 'dt-3.11-3' of git://git.infradead.org/users/jcooper/linux into next/dt (diff) | |
| download | linux-dev-3c09f4daeee83b76779dec766f57e9e883402bb1.tar.xz linux-dev-3c09f4daeee83b76779dec766f57e9e883402bb1.zip | |
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')
| -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) __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"); |