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> --- drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c | 2 +- drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c | 2 +- drivers/staging/media/tegra-video/csi.c | 2 +- drivers/staging/media/tegra-video/vi.c | 2 +- drivers/staging/media/tegra-video/vip.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c index 31b2b48085c5..bed11223e4be 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama5d2-isc.c @@ -343,7 +343,7 @@ static int isc_parse_dt(struct device *dev, struct isc_device *isc) while (1) { struct v4l2_fwnode_endpoint v4l2_epn = { .bus_type = 0 }; - epn = of_graph_get_next_endpoint(np, epn); + epn = of_graph_get_next_device_endpoint(np, epn); if (!epn) return 0; diff --git a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c index 020034f631f5..e0dcec334ae2 100644 --- a/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c +++ b/drivers/staging/media/deprecated/atmel/atmel-sama7g5-isc.c @@ -329,7 +329,7 @@ static int xisc_parse_dt(struct device *dev, struct isc_device *isc) while (1) { struct v4l2_fwnode_endpoint v4l2_epn = { .bus_type = 0 }; - epn = of_graph_get_next_endpoint(np, epn); + epn = of_graph_get_next_device_endpoint(np, epn); if (!epn) return 0; diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index 9aa72863c213..2135dca9725e 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -571,7 +571,7 @@ static int tegra_csi_channels_alloc(struct tegra_csi *csi) goto err_node_put; } - num_pads = of_graph_get_endpoint_count(channel); + num_pads = of_graph_get_device_endpoint_count(channel); if (num_pads == TEGRA_CSI_PADS_NUM) { ret = tegra_csi_channel_alloc(csi, channel, portno, lanes, num_pads); diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 94171e62dee9..de63721495ef 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1704,7 +1704,7 @@ static int tegra_vi_graph_parse_one(struct tegra_vi_channel *chan, dev_dbg(vi->dev, "parsing node %pOF\n", to_of_node(fwnode)); /* parse all the remote entities and put them into the list */ - for_each_endpoint_of_node(to_of_node(fwnode), node) { + for_each_device_endpoint_of_node(to_of_node(fwnode), node) { ep = of_fwnode_handle(node); remote = fwnode_graph_get_remote_port_parent(ep); if (!remote) { diff --git a/drivers/staging/media/tegra-video/vip.c b/drivers/staging/media/tegra-video/vip.c index e95cc7bb190e..78b3cdf7ee29 100644 --- a/drivers/staging/media/tegra-video/vip.c +++ b/drivers/staging/media/tegra-video/vip.c @@ -137,7 +137,7 @@ static int tegra_vip_channel_of_parse(struct tegra_vip *vip) goto err_node_put; } - num_pads = of_graph_get_endpoint_count(np); + num_pads = of_graph_get_device_endpoint_count(np); if (num_pads != TEGRA_VIP_PADS_NUM) { err = -EINVAL; dev_err_probe(dev, err, "%pOF: need 2 pads, got %d\n", np, num_pads); -- 2.25.1