nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

clocksource/drivers/timer-of: Don't request the resource by name

Browse source 
When the driver does not specify a name for the resource, don't use
of_io_request_and_map() but of_iomap(). That prevents resource name allocation
conflicts on some platforms which have the same name as the node.

Tested-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Benjamin Gaignard <benjamin.gaignard@st.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1515418139-23276-10-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Daniel Lezcano 2018-01-08 14:28:49 +01:00 committed by Ingo Molnar
parent 1c63c1c089
commit 9aea417afa
1 changed files with 4 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/clocksource/timer-of.c
View file

@ -161,11 +161,11 @@ static __init void timer_of_base_exit(struct of_timer_base *of_base)
static __init int timer_of_base_init(struct device_node *np, static __init int timer_of_base_init(struct device_node *np,
struct of_timer_base *of_base) struct of_timer_base *of_base)
{ {
const char *name = of_base->name ? of_base->name : np->full_name; of_base->base = of_base->name ?
of_io_request_and_map(np, of_base->index, of_base->name) :
of_base->base = of_io_request_and_map(np, of_base->index, name); of_iomap(np, of_base->index);
if (IS_ERR(of_base->base)) { if (IS_ERR(of_base->base)) {
pr_err("Failed to iomap (%s)\n", name); pr_err("Failed to iomap (%s)\n", of_base->name);
return PTR_ERR(of_base->base); return PTR_ERR(of_base->base);
} }