Re: [PATCH] media: i2c: tvp514x: add support for asynchronous probing

[Guennadi Liakhovetski]

On Sat, 22 Jun 2013, Prabhakar Lad wrote:

> From: "Lad, Prabhakar" <prabhakar.csengg@xxxxxxxxx>
> 
> Both synchronous and asynchronous tvp514x subdevice probing is supported by
> this patch.
> 
> Signed-off-by: Prabhakar Lad <prabhakar.csengg@xxxxxxxxx>
> Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx>
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
> Cc: Sakari Ailus <sakari.ailus@xxxxxx>
> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> ---
>  drivers/media/i2c/tvp514x.c |   22 +++++++++++++++-------
>  1 file changed, 15 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
> index 864eb14..d090caf 100644
> --- a/drivers/media/i2c/tvp514x.c
> +++ b/drivers/media/i2c/tvp514x.c
> @@ -36,6 +36,7 @@
>  #include <linux/module.h>
>  #include <linux/v4l2-mediabus.h>
>  
> +#include <media/v4l2-async.h>
>  #include <media/v4l2-device.h>
>  #include <media/v4l2-common.h>
>  #include <media/v4l2-mediabus.h>

Ok, but this one really does too many things in one patch:

> @@ -1148,9 +1149,9 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
>  	/* Register with V4L2 layer as slave device */
>  	sd = &decoder->sd;
>  	v4l2_i2c_subdev_init(sd, client, &tvp514x_ops);
> -	strlcpy(sd->name, TVP514X_MODULE_NAME, sizeof(sd->name));
>  
>  #if defined(CONFIG_MEDIA_CONTROLLER)
> +	strlcpy(sd->name, TVP514X_MODULE_NAME, sizeof(sd->name));

This is unrelated

>  	decoder->pad.flags = MEDIA_PAD_FL_SOURCE;
>  	decoder->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
>  	decoder->sd.entity.flags |= MEDIA_ENT_T_V4L2_SUBDEV_DECODER;
> @@ -1176,16 +1177,22 @@ tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id)
>  	sd->ctrl_handler = &decoder->hdl;
>  	if (decoder->hdl.error) {
>  		ret = decoder->hdl.error;
> -
> -		v4l2_ctrl_handler_free(&decoder->hdl);
> -		return ret;
> +		goto done;
>  	}
>  	v4l2_ctrl_handler_setup(&decoder->hdl);
>  
> -	v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
> -
> -	return 0;
> +	ret = v4l2_async_register_subdev(&decoder->sd);
> +	if (!ret)
> +		v4l2_info(sd, "%s decoder driver registered !!\n", sd->name);
>  
> +done:
> +	if (ret < 0) {
> +		v4l2_ctrl_handler_free(&decoder->hdl);
> +#if defined(CONFIG_MEDIA_CONTROLLER)
> +		media_entity_cleanup(&decoder->sd.entity);

So is this - it wasn't called before in the "if (decoder->hdl.error)" case 
above.

Thanks
Guennadi

> +#endif
> +	}
> +	return ret;
>  }
>  
>  /**
> @@ -1200,6 +1207,7 @@ static int tvp514x_remove(struct i2c_client *client)
>  	struct v4l2_subdev *sd = i2c_get_clientdata(client);
>  	struct tvp514x_decoder *decoder = to_decoder(sd);
>  
> +	v4l2_async_unregister_subdev(&decoder->sd);
>  	v4l2_device_unregister_subdev(sd);
>  #if defined(CONFIG_MEDIA_CONTROLLER)
>  	media_entity_cleanup(&decoder->sd.entity);
> -- 
> 1.7.9.5
> 

---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/