diff mbox series

media: v4l2-fwnode: Simplify v4l2_async_notifier_parse_fwnode_endpoints()

Message ID 20210310153743.3556385-1-niklas.soderlund+renesas@ragnatech.se (mailing list archive)
State New
Delegated to: Kieran Bingham
Headers show
Series media: v4l2-fwnode: Simplify v4l2_async_notifier_parse_fwnode_endpoints() | expand

Commit Message

Niklas Söderlund March 10, 2021, 3:37 p.m. UTC
There are only one user left of __v4l2_async_notifier_parse_fwnode_ep()
since [1], v4l2_async_notifier_parse_fwnode_endpoints(). Merge the two
and remove some dead code.

1. commit 0ae426ebd0dcef81 ("media: v4l2-fwnode: Remove v4l2_async_notifier_parse_fwnode_endpoints_by_port()")

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 drivers/media/v4l2-core/v4l2-fwnode.c | 34 ++++-----------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

Comments

Sakari Ailus March 11, 2021, 11:51 a.m. UTC | #1
Hi Niklas,

On Wed, Mar 10, 2021 at 04:37:43PM +0100, Niklas Söderlund wrote:
> There are only one user left of __v4l2_async_notifier_parse_fwnode_ep()
> since [1], v4l2_async_notifier_parse_fwnode_endpoints(). Merge the two
> and remove some dead code.
> 
> 1. commit 0ae426ebd0dcef81 ("media: v4l2-fwnode: Remove v4l2_async_notifier_parse_fwnode_endpoints_by_port()")
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

This and the rcar-vin patch no longer apply after my patches related to
V4L2 async. Could you rebase these on them? I've pushed them to the master
branch in my V4L2 git tree.

Thanks.
Niklas Söderlund March 12, 2021, 2:32 p.m. UTC | #2
Hi Sakari,

Thanks for your feedback.

On 2021-03-11 13:51:27 +0200, Sakari Ailus wrote:
> Hi Niklas,
> 
> On Wed, Mar 10, 2021 at 04:37:43PM +0100, Niklas Söderlund wrote:
> > There are only one user left of __v4l2_async_notifier_parse_fwnode_ep()
> > since [1], v4l2_async_notifier_parse_fwnode_endpoints(). Merge the two
> > and remove some dead code.
> > 
> > 1. commit 0ae426ebd0dcef81 ("media: v4l2-fwnode: Remove v4l2_async_notifier_parse_fwnode_endpoints_by_port()")
> > 
> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> 
> This and the rcar-vin patch no longer apply after my patches related to
> V4L2 async. Could you rebase these on them? I've pushed them to the master
> branch in my V4L2 git tree.

I will rebase and resend those two.

A heads up, your branch fails to compile for me so I had to locally drop 
'v4l: async, fwnode: Improve module organisation' while testing. I will 
reply to your series with more detailed feedback.

> 
> Thanks.
> 
> -- 
> Kind regards,
> 
> Sakari Ailus
diff mbox series

Patch

diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
index 2283ff3b8e1d8662..2abb1430da1e1cf5 100644
--- a/drivers/media/v4l2-core/v4l2-fwnode.c
+++ b/drivers/media/v4l2-core/v4l2-fwnode.c
@@ -839,13 +839,11 @@  v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev,
 	return ret == -ENOTCONN ? 0 : ret;
 }
 
-static int
-__v4l2_async_notifier_parse_fwnode_ep(struct device *dev,
-				      struct v4l2_async_notifier *notifier,
-				      size_t asd_struct_size,
-				      unsigned int port,
-				      bool has_port,
-				      parse_endpoint_func parse_endpoint)
+int
+v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
+					   struct v4l2_async_notifier *notifier,
+					   size_t asd_struct_size,
+					   parse_endpoint_func parse_endpoint)
 {
 	struct fwnode_handle *fwnode;
 	int ret = 0;
@@ -863,17 +861,6 @@  __v4l2_async_notifier_parse_fwnode_ep(struct device *dev,
 		if (!is_available)
 			continue;
 
-		if (has_port) {
-			struct fwnode_endpoint ep;
-
-			ret = fwnode_graph_parse_endpoint(fwnode, &ep);
-			if (ret)
-				break;
-
-			if (ep.port != port)
-				continue;
-		}
-
 		ret = v4l2_async_notifier_fwnode_parse_endpoint(dev,
 								notifier,
 								fwnode,
@@ -887,17 +874,6 @@  __v4l2_async_notifier_parse_fwnode_ep(struct device *dev,
 
 	return ret;
 }
-
-int
-v4l2_async_notifier_parse_fwnode_endpoints(struct device *dev,
-					   struct v4l2_async_notifier *notifier,
-					   size_t asd_struct_size,
-					   parse_endpoint_func parse_endpoint)
-{
-	return __v4l2_async_notifier_parse_fwnode_ep(dev, notifier,
-						     asd_struct_size, 0,
-						     false, parse_endpoint);
-}
 EXPORT_SYMBOL_GPL(v4l2_async_notifier_parse_fwnode_endpoints);
 
 /*