lkml.org 
[lkml]   [2013]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCHv2 1/2] clocksource: zevio-timer: fix compile-time warnings
Date
From: Daniel Tang <dt.tangr@gmail.com>

Fix incorrect function definition of zevio_timer_add so the correct function
pointer is passed to CLOCKSOURCE_OF_DECLARE.

Signed-off-by: Daniel Tang <dt.tangr@gmail.com>
---
drivers/clocksource/zevio-timer.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/drivers/clocksource/zevio-timer.c b/drivers/clocksource/zevio-timer.c
index ca81809..a1bd107 100644
--- a/drivers/clocksource/zevio-timer.c
+++ b/drivers/clocksource/zevio-timer.c
@@ -122,28 +122,27 @@ static irqreturn_t zevio_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}

-static int __init zevio_timer_add(struct device_node *node)
+static void __init zevio_timer_add(struct device_node *node)
{
struct zevio_timer *timer;
struct resource res;
- int irqnr, ret;
+ int irqnr;

timer = kzalloc(sizeof(*timer), GFP_KERNEL);
if (!timer)
- return -ENOMEM;
+ return;

timer->base = of_iomap(node, 0);
- if (!timer->base) {
- ret = -EINVAL;
+ if (!timer->base)
goto error_free;
- }
+
timer->timer1 = timer->base + IO_TIMER1;
timer->timer2 = timer->base + IO_TIMER2;

timer->clk = of_clk_get(node, 0);
if (IS_ERR(timer->clk)) {
- ret = PTR_ERR(timer->clk);
- pr_err("Timer clock not found! (error %d)\n", ret);
+ pr_err("Timer clock not found! (error %d)\n",
+ (int)PTR_ERR(timer->clk));
goto error_unmap;
}

@@ -204,12 +203,12 @@ static int __init zevio_timer_add(struct device_node *node)

pr_info("Added %s as clocksource\n", timer->clocksource_name);

- return 0;
+ return;
error_unmap:
iounmap(timer->base);
error_free:
kfree(timer);
- return ret;
+ return;
}

CLOCKSOURCE_OF_DECLARE(zevio_timer, "lsi,zevio-timer", zevio_timer_add);
--
1.8.1.3


\
 
 \ /
  Last update: 2013-12-04 11:21    [W:0.053 / U:0.976 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site