xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: mvebu: make use of of_find_matching_node_and_match

Browse Source 
Instead of the of_find_matching_node()/of_match_node() pair, which requires two
iterations through the match table, make use of of_find_matching_node_and_match(),
which only iterates through the table once.

While we're here, mark the of_system_controller table const.

Signed-off-by: Josh Cartwright <joshc@codeaurora.org>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Josh Cartwright
2014-02-11 10:24:02 -06:00
committed by Jason Cooper
parent fee04e7f0a
commit a8cacc0a45
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-mvebu/system-controller.c
View File

@@ -54,7 +54,7 @@ static const struct mvebu_system_controller orion_system_controller = {
.system_soft_reset = 0x1, .system_soft_reset = 0x1,
}; };
static struct of_device_id of_system_controller_table[] = { static const struct of_device_id of_system_controller_table[] = {
{ {
.compatible = "marvell,orion-system-controller", .compatible = "marvell,orion-system-controller",
.data = (void *) &orion_system_controller, .data = (void *) &orion_system_controller,
@@ -90,13 +90,12 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd)
static int __init mvebu_system_controller_init(void) static int __init mvebu_system_controller_init(void)
{ {
const struct of_device_id *match;
struct device_node *np; struct device_node *np;
np = of_find_matching_node(NULL, of_system_controller_table); np = of_find_matching_node_and_match(NULL, of_system_controller_table,
&match);
if (np) { if (np) {
const struct of_device_id *match =
of_match_node(of_system_controller_table, np);
BUG_ON(!match);
system_controller_base = of_iomap(np, 0); system_controller_base = of_iomap(np, 0);
mvebu_sc = (struct mvebu_system_controller *)match->data; mvebu_sc = (struct mvebu_system_controller *)match->data;
of_node_put(np); of_node_put(np);