Re: [PATCH 07/11] rcar-vin: Extend group notifier DT parser to work with any port

[Jacopo Mondi <jacopo@jmondi.org>]

Hi Niklas,

On Tue, Apr 13, 2021 at 08:02:49PM +0200, Niklas Söderlund wrote:
> The R-Car VIN group notifier will be extend to support a new group of
> subdevices, the R-Car ISP channel selector in addition to the existing
> R-Car CSI-2 receiver subdevices.
>
> The existing DT parsing code can be reused if the port and max number of
> endpoints are provided as parameters instead of being hard-coded. While
> at it align the group notifier parser function names with the rest of
> the driver.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
>  drivers/media/platform/rcar-vin/rcar-core.c | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c
> index d951f739b3a9a034..2628637084ae2aa9 100644
> --- a/drivers/media/platform/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/rcar-vin/rcar-core.c
> @@ -506,7 +506,8 @@ static const struct v4l2_async_notifier_operations rvin_group_notify_ops = {
>  	.complete = rvin_group_notify_complete,
>  };
>
> -static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id)
> +static int rvin_group_parse_of(struct rvin_dev *vin, unsigned int port,
> +			       unsigned int id)
>  {
>  	struct fwnode_handle *ep, *fwnode;
>  	struct v4l2_fwnode_endpoint vep = {
> @@ -515,7 +516,7 @@ static int rvin_mc_parse_of(struct rvin_dev *vin, unsigned int id)
>  	struct v4l2_async_subdev *asd;
>  	int ret;
>
> -	ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(vin->dev), 1, id, 0);
> +	ep = fwnode_graph_get_endpoint_by_id(dev_fwnode(vin->dev), port, id, 0);
>  	if (!ep)
>  		return 0;
>
> @@ -563,7 +564,8 @@ static void rvin_group_notifier_cleanup(struct rvin_dev *vin)
>  	mutex_unlock(&vin->group->lock);
>  }
>
> -static int rvin_mc_parse_of_graph(struct rvin_dev *vin)
> +static int rvin_group_notifier_init(struct rvin_dev *vin, unsigned int port,
> +				    unsigned int max_id)
>  {
>  	unsigned int count = 0, vin_mask = 0;
>  	unsigned int i, id;
> @@ -589,19 +591,18 @@ static int rvin_mc_parse_of_graph(struct rvin_dev *vin)
>  	v4l2_async_notifier_init(&vin->group->notifier);
>
>  	/*
> -	 * Have all VIN's look for CSI-2 subdevices. Some subdevices will
> -	 * overlap but the parser function can handle it, so each subdevice
> -	 * will only be registered once with the group notifier.
> +	 * Some subdevices may overlap but the parser function can handle it and
> +	 * each subdevice will only be registered once with the group notifier.
>  	 */
>  	for (i = 0; i < RCAR_VIN_NUM; i++) {
>  		if (!(vin_mask & BIT(i)))
>  			continue;
>
> -		for (id = 0; id < RVIN_CSI_MAX; id++) {
> +		for (id = 0; id < max_id; id++) {
>  			if (vin->group->remotes[id].asd)
>  				continue;
>
> -			ret = rvin_mc_parse_of(vin->group->vin[i], id);
> +			ret = rvin_group_parse_of(vin->group->vin[i], port, id);
>  			if (ret)
>  				return ret;
>  		}
> @@ -981,7 +982,7 @@ static int rvin_csi2_init(struct rvin_dev *vin)
>  	if (ret && ret != -ENODEV)
>  		goto err_group;
>
> -	ret = rvin_mc_parse_of_graph(vin);
> +	ret = rvin_group_notifier_init(vin, 1, RVIN_CSI_MAX);

You know, I would define RVIN_CSI2_ENDPOINT_NUM or similar.
Small nit apart, it's good to be able to reuse the same routines!

Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org>

Thanks
   j

>  	if (ret)
>  		goto err_parallel;
>
> --
> 2.31.1
>