of_graph_get_next_endpoint() is now renamed to of_graph_get_next_device_endpoint(). Switch to it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> --- sound/soc/codecs/ak4613.c | 2 +- sound/soc/generic/audio-graph-card2.c | 2 +- sound/soc/generic/simple-card-utils.c | 6 +++--- sound/soc/generic/test-component.c | 4 ++-- sound/soc/sh/rcar/core.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c index 73fb35560e51..1e1d9c7abdc7 100644 --- a/sound/soc/codecs/ak4613.c +++ b/sound/soc/codecs/ak4613.c @@ -870,7 +870,7 @@ static void ak4613_parse_of(struct ak4613_priv *priv, * TDM support is assuming it is probed via Audio-Graph-Card style here. * Default is SDTIx1 if it was probed via Simple-Audio-Card for now. */ - sdti_num = of_graph_get_endpoint_count(np); + sdti_num = of_graph_get_device_endpoint_count(np); if ((sdti_num >= SDTx_MAX) || (sdti_num < 1)) sdti_num = 1; diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c index 62606e20be9a..c3763719a69f 100644 --- a/sound/soc/generic/audio-graph-card2.c +++ b/sound/soc/generic/audio-graph-card2.c @@ -1104,7 +1104,7 @@ static int graph_counter(struct device_node *lnk) /* * CPU/Codec = N:M case has many endpoints. - * We can't use of_graph_get_endpoint_count() here + * We can't use of_graph_get_device_endpoint_count() here */ while(1) { port = of_get_next_child(ports, port); diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 81077d16d22f..2c89b711b1ea 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -1049,7 +1049,7 @@ static int graph_get_dai_id(struct device_node *ep) */ i = 0; id = -1; - for_each_endpoint_of_node(node, endpoint) { + for_each_device_endpoint_of_node(node, endpoint) { if (endpoint == ep) id = i; i++; @@ -1093,7 +1093,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, /* Get dai->name */ args.np = node; args.args[0] = graph_get_dai_id(ep); - args.args_count = (of_graph_get_endpoint_count(node) > 1); + args.args_count = (of_graph_get_device_endpoint_count(node) > 1); /* * FIXME @@ -1122,7 +1122,7 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, parse_dai_end: if (is_single_link) - *is_single_link = of_graph_get_endpoint_count(node) == 1; + *is_single_link = of_graph_get_device_endpoint_count(node) == 1; return 0; } diff --git a/sound/soc/generic/test-component.c b/sound/soc/generic/test-component.c index e4967540a2e1..0ebacbcddee3 100644 --- a/sound/soc/generic/test-component.c +++ b/sound/soc/generic/test-component.c @@ -538,7 +538,7 @@ static int test_driver_probe(struct platform_device *pdev) struct test_priv *priv; int num, ret, i; - num = of_graph_get_endpoint_count(node); + num = of_graph_get_device_endpoint_count(node); if (!num) { dev_err(dev, "no port exits\n"); return -EINVAL; @@ -600,7 +600,7 @@ static int test_driver_probe(struct platform_device *pdev) } i = 0; - for_each_endpoint_of_node(node, ep) { + for_each_device_endpoint_of_node(node, ep) { snprintf(dname[i].name, TEST_NAME_LEN, "%s.%d", node->name, i); ddriv[i].name = dname[i].name; diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 0b1aa23c1189..d0581232063a 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1298,7 +1298,7 @@ static int rsnd_dai_of_node(struct rsnd_priv *priv, int *is_graph) if (!of_node_name_eq(ports, "ports") && !of_node_name_eq(ports, "port")) continue; - priv->component_dais[i] = of_graph_get_endpoint_count(ports); + priv->component_dais[i] = of_graph_get_device_endpoint_count(ports); nr += priv->component_dais[i]; i++; if (i >= RSND_MAX_COMPONENT) { @@ -1510,7 +1510,7 @@ static int rsnd_dai_probe(struct rsnd_priv *priv) if (!of_node_name_eq(ports, "ports") && !of_node_name_eq(ports, "port")) continue; - for_each_endpoint_of_node(ports, dai_np) { + for_each_device_endpoint_of_node(ports, dai_np) { __rsnd_dai_probe(priv, dai_np, dai_np, 0, dai_i); if (rsnd_is_gen3(priv) || rsnd_is_gen4(priv)) { rdai = rsnd_rdai_get(priv, dai_i); -- 2.25.1