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.
Signed-off-by: Josh Cartwright <[email protected]> --- arch/c6x/platforms/plldata.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/c6x/platforms/plldata.c b/arch/c6x/platforms/plldata.c index 755359e..8fddc46 100644 --- a/arch/c6x/platforms/plldata.c +++ b/arch/c6x/platforms/plldata.c @@ -397,7 +397,7 @@ static void __init c6678_setup_clocks(struct device_node *node) } #endif /* CONFIG_SOC_TMS320C6678 */ -static struct of_device_id c6x_clkc_match[] __initdata = { +static const struct of_device_id c6x_clkc_match[] __initdata = { #ifdef CONFIG_SOC_TMS320C6455 { .compatible = "ti,c6455-pll", .data = c6455_setup_clocks }, #endif @@ -426,7 +426,7 @@ void __init c64x_setup_clocks(void) int err; u32 val; - node = of_find_matching_node(NULL, c6x_clkc_match); + node = of_find_matching_node_and_match(NULL, c6x_clkc_match, &id); if (!node) return; @@ -458,8 +458,7 @@ void __init c64x_setup_clocks(void) pll->lock_delay = val; /* id->data is a pointer to SoC-specific setup */ - id = of_match_node(c6x_clkc_match, node); - if (id && id->data) { + if (id->data) { __setup_clocks = id->data; __setup_clocks(node); } -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
