projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nfp-mtu-buffer-reconfig'
[cascardo/linux.git]
/
drivers
/
clocksource
/
time-pistachio.c
diff --git
a/drivers/clocksource/time-pistachio.c
b/drivers/clocksource/time-pistachio.c
index
3269d9e
..
376e59b
100644
(file)
--- a/
drivers/clocksource/time-pistachio.c
+++ b/
drivers/clocksource/time-pistachio.c
@@
-163,7
+163,7
@@
static void __init pistachio_clksrc_of_init(struct device_node *node)
periph_regs = syscon_regmap_lookup_by_phandle(node, "img,cr-periph");
if (IS_ERR(periph_regs)) {
periph_regs = syscon_regmap_lookup_by_phandle(node, "img,cr-periph");
if (IS_ERR(periph_regs)) {
- pr_err("cannot get peripheral regmap (%l
u
)\n",
+ pr_err("cannot get peripheral regmap (%l
d
)\n",
PTR_ERR(periph_regs));
return;
}
PTR_ERR(periph_regs));
return;
}
@@
-176,7
+176,7
@@
static void __init pistachio_clksrc_of_init(struct device_node *node)
sys_clk = of_clk_get_by_name(node, "sys");
if (IS_ERR(sys_clk)) {
sys_clk = of_clk_get_by_name(node, "sys");
if (IS_ERR(sys_clk)) {
- pr_err("clock get failed (%l
u
)\n", PTR_ERR(sys_clk));
+ pr_err("clock get failed (%l
d
)\n", PTR_ERR(sys_clk));
return;
}
return;
}