On Mon, May 12, 2014 at 7:29 PM, Rob Herring <[email protected]> wrote: > From: Rob Herring <[email protected]> > > Use for_each_matching_node_and_match instead of for_each_matching_node plus > of_match_node to avoid searching the DT twice for each node. > > The sunxi DT scanning code should really be re-worked rather than have > its own private matching infrastructure. It is working around needing a > function pointer and a data pointer for each compatible match. > > Signed-off-by: Rob Herring <[email protected]> > Cc: "Emilio López" <[email protected]> > Cc: Mike Turquette <[email protected]> > Cc: Maxime Ripard <[email protected]> > --- > drivers/clk/sunxi/clk-sunxi.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c > index bd7dc73..7977106 100644 > --- a/drivers/clk/sunxi/clk-sunxi.c > +++ b/drivers/clk/sunxi/clk-sunxi.c > @@ -1278,8 +1278,7 @@ static void __init of_sunxi_table_clock_setup(const > struct of_device_id *clk_mat > const struct of_device_id *match; > void (*setup_function)(struct device_node *, const void *) = function; > > - for_each_matching_node(np, clk_match) { > - match = of_match_node(clk_match, np); > + for_each_matching_node_and_match(np, clk_match, match) {
I missed folding in a fix and this should be &match instead of match. Rob > data = match->data; > setup_function(np, data); > } > -- > 1.9.1 > -- 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/
