git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power...
[sfrench/cifs-2.6.git]
/
drivers
/
clocksource
/
h8300_timer8.c
diff --git
a/drivers/clocksource/h8300_timer8.c
b/drivers/clocksource/h8300_timer8.c
index c151941e1956d3a8338edeeeefd4c09e0d78066c..546bb180f5a4481d6d13f7b68e37537940c3e795 100644
(file)
--- a/
drivers/clocksource/h8300_timer8.c
+++ b/
drivers/clocksource/h8300_timer8.c
@@
-164,24
+164,26
@@
static struct timer8_priv timer8_priv = {
},
};
},
};
-static
void
__init h8300_8timer_init(struct device_node *node)
+static
int
__init h8300_8timer_init(struct device_node *node)
{
void __iomem *base;
{
void __iomem *base;
- int irq;
+ int irq
, ret
;
struct clk *clk;
clk = of_clk_get(node, 0);
if (IS_ERR(clk)) {
pr_err("failed to get clock for clockevent\n");
struct clk *clk;
clk = of_clk_get(node, 0);
if (IS_ERR(clk)) {
pr_err("failed to get clock for clockevent\n");
- return;
+ return
PTR_ERR(clk)
;
}
}
+ ret = ENXIO;
base = of_iomap(node, 0);
if (!base) {
pr_err("failed to map registers for clockevent\n");
goto free_clk;
}
base = of_iomap(node, 0);
if (!base) {
pr_err("failed to map registers for clockevent\n");
goto free_clk;
}
+ ret = -EINVAL;
irq = irq_of_parse_and_map(node, 0);
if (!irq) {
pr_err("failed to get irq for clockevent\n");
irq = irq_of_parse_and_map(node, 0);
if (!irq) {
pr_err("failed to get irq for clockevent\n");
@@
-205,11
+207,12
@@
static void __init h8300_8timer_init(struct device_node *node)
clockevents_config_and_register(&timer8_priv.ced,
timer8_priv.rate, 1, 0x0000ffff);
clockevents_config_and_register(&timer8_priv.ced,
timer8_priv.rate, 1, 0x0000ffff);
- return;
+ return
0
;
unmap_reg:
iounmap(base);
free_clk:
clk_put(clk);
unmap_reg:
iounmap(base);
free_clk:
clk_put(clk);
+ return ret;
}
CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init);
}
CLOCKSOURCE_OF_DECLARE(h8300_8bit, "renesas,8bit-timer", h8300_8timer_init);