| Message ID | 20201130133129.1024662-12-djrscally@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
Hi Daniel, Thank you for the patch. On Mon, Nov 30, 2020 at 01:31:22PM +0000, Daniel Scally wrote: > Where the fwnode graph is comprised of software_nodes, these will be > assigned as the secondary to dev->fwnode. Check the v4l2_subdev's fwnode > for a secondary and attempt to match against it during match_fwnode() to > accommodate that possibility. > > Signed-off-by: Daniel Scally <djrscally@gmail.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > Changes since RFC v3: > > - None > > drivers/media/v4l2-core/v4l2-async.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c > index e3ab003a6c85..6486dbde784f 100644 > --- a/drivers/media/v4l2-core/v4l2-async.c > +++ b/drivers/media/v4l2-core/v4l2-async.c > @@ -87,6 +87,14 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier, > if (sd->fwnode == asd->match.fwnode) > return true; > > + /* > + * Check the same situation for any possible secondary assigned to the > + * subdev's fwnode > + */ > + if ((!IS_ERR_OR_NULL(sd->fwnode->secondary)) && > + sd->fwnode->secondary == asd->match.fwnode) > + return true; > + > /* > * Otherwise, check if the sd fwnode and the asd fwnode refer to an > * endpoint or a device. If they're of the same type, there's no match.
On Mon, Nov 30, 2020 at 01:31:22PM +0000, Daniel Scally wrote: > Where the fwnode graph is comprised of software_nodes, these will be > assigned as the secondary to dev->fwnode. Check the v4l2_subdev's fwnode > for a secondary and attempt to match against it during match_fwnode() to > accommodate that possibility. One nit below. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Daniel Scally <djrscally@gmail.com> > --- > Changes since RFC v3: > > - None > > drivers/media/v4l2-core/v4l2-async.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c > index e3ab003a6c85..6486dbde784f 100644 > --- a/drivers/media/v4l2-core/v4l2-async.c > +++ b/drivers/media/v4l2-core/v4l2-async.c > @@ -87,6 +87,14 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier, > if (sd->fwnode == asd->match.fwnode) > return true; > > + /* > + * Check the same situation for any possible secondary assigned to the > + * subdev's fwnode > + */ > + if ((!IS_ERR_OR_NULL(sd->fwnode->secondary)) && Too many parentheses. > + sd->fwnode->secondary == asd->match.fwnode) > + return true; > + > /* > * Otherwise, check if the sd fwnode and the asd fwnode refer to an > * endpoint or a device. If they're of the same type, there's no match. > -- > 2.25.1 >
diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index e3ab003a6c85..6486dbde784f 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -87,6 +87,14 @@ static bool match_fwnode(struct v4l2_async_notifier *notifier, if (sd->fwnode == asd->match.fwnode) return true; + /* + * Check the same situation for any possible secondary assigned to the + * subdev's fwnode + */ + if ((!IS_ERR_OR_NULL(sd->fwnode->secondary)) && + sd->fwnode->secondary == asd->match.fwnode) + return true; + /* * Otherwise, check if the sd fwnode and the asd fwnode refer to an * endpoint or a device. If they're of the same type, there's no match.
Where the fwnode graph is comprised of software_nodes, these will be assigned as the secondary to dev->fwnode. Check the v4l2_subdev's fwnode for a secondary and attempt to match against it during match_fwnode() to accommodate that possibility. Signed-off-by: Daniel Scally <djrscally@gmail.com> --- Changes since RFC v3: - None drivers/media/v4l2-core/v4l2-async.c | 8 ++++++++ 1 file changed, 8 insertions(+)