linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ezequiel Garcia <ezequiel@collabora.com>
To: Hans Verkuil <hverkuil-cisco@xs4all.nl>, linux-media@vger.kernel.org
Cc: Jonathan Corbet <corbet@lwn.net>
Subject: Re: [PATCH 2/4] via-camera: use struct v4l2_fh
Date: Sun, 21 Jul 2019 11:30:47 -0300	[thread overview]
Message-ID: <b830214ec4878114395b32510b41d5861dd1fbea.camel@collabora.com> (raw)
In-Reply-To: <20190717090345.26521-3-hverkuil-cisco@xs4all.nl>

On Wed, 2019-07-17 at 11:03 +0200, Hans Verkuil wrote:
> Modern V4L2 drivers should use struct v4l2_fh to represent a filehandle.
> This driver was one of the few that didn't use it.
> 
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>

> ---
>  drivers/media/platform/via-camera.c | 47 +++++++++++++++++------------
>  1 file changed, 27 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
> index f9016c2ee70d..49e51feebc7d 100644
> --- a/drivers/media/platform/via-camera.c
> +++ b/drivers/media/platform/via-camera.c
> @@ -660,19 +660,22 @@ static const struct videobuf_queue_ops viacam_vb_ops = {
>  static int viacam_open(struct file *filp)
>  {
>  	struct via_camera *cam = video_drvdata(filp);
> +	int ret;
>  
> -	filp->private_data = cam;
>  	/*
>  	 * Note the new user.  If this is the first one, we'll also
>  	 * need to power up the sensor.
>  	 */
>  	mutex_lock(&cam->lock);
> -	if (cam->users == 0) {
> -		int ret = viafb_request_dma();
> +	ret = v4l2_fh_open(filp);
> +	if (ret)
> +		goto out;
> +	if (v4l2_fh_is_singular_file(filp)) {
> +		ret = viafb_request_dma();
>  
>  		if (ret) {
> -			mutex_unlock(&cam->lock);
> -			return ret;
> +			v4l2_fh_release(filp);
> +			goto out;
>  		}
>  		via_sensor_power_up(cam);
>  		set_bit(CF_CONFIG_NEEDED, &cam->flags);
> @@ -685,16 +688,19 @@ static int viacam_open(struct file *filp)
>  				sizeof(struct videobuf_buffer), cam, NULL);
>  	}
>  	(cam->users)++;
> +out:
>  	mutex_unlock(&cam->lock);
> -	return 0;
> +	return ret;
>  }
>  
>  static int viacam_release(struct file *filp)
>  {
>  	struct via_camera *cam = video_drvdata(filp);
> +	bool last_open;
>  
>  	mutex_lock(&cam->lock);
>  	(cam->users)--;
> +	last_open = v4l2_fh_is_singular_file(filp);
>  	/*
>  	 * If the "owner" is closing, shut down any ongoing
>  	 * operations.
> @@ -714,11 +720,12 @@ static int viacam_release(struct file *filp)
>  	/*
>  	 * Last one out needs to turn out the lights.
>  	 */
> -	if (cam->users == 0) {
> +	if (last_open) {
>  		videobuf_mmap_free(&cam->vb_queue);
>  		via_sensor_power_down(cam);
>  		viafb_release_dma();
>  	}
> +	v4l2_fh_release(filp);
>  	mutex_unlock(&cam->lock);
>  	return 0;
>  }
> @@ -927,7 +934,7 @@ static int viacam_do_try_fmt(struct via_camera *cam,
>  static int viacam_try_fmt_vid_cap(struct file *filp, void *priv,
>  		struct v4l2_format *fmt)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	struct v4l2_format sfmt;
>  	int ret;
>  
> @@ -941,7 +948,7 @@ static int viacam_try_fmt_vid_cap(struct file *filp, void *priv,
>  static int viacam_g_fmt_vid_cap(struct file *filp, void *priv,
>  		struct v4l2_format *fmt)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  
>  	mutex_lock(&cam->lock);
>  	fmt->fmt.pix = cam->user_format;
> @@ -952,7 +959,7 @@ static int viacam_g_fmt_vid_cap(struct file *filp, void *priv,
>  static int viacam_s_fmt_vid_cap(struct file *filp, void *priv,
>  		struct v4l2_format *fmt)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	int ret;
>  	struct v4l2_format sfmt;
>  	struct via_format *f = via_find_format(fmt->fmt.pix.pixelformat);
> @@ -1004,7 +1011,7 @@ static int viacam_querycap(struct file *filp, void *priv,
>  static int viacam_reqbufs(struct file *filp, void *priv,
>  		struct v4l2_requestbuffers *rb)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  
>  	return videobuf_reqbufs(&cam->vb_queue, rb);
>  }
> @@ -1012,28 +1019,28 @@ static int viacam_reqbufs(struct file *filp, void *priv,
>  static int viacam_querybuf(struct file *filp, void *priv,
>  		struct v4l2_buffer *buf)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  
>  	return videobuf_querybuf(&cam->vb_queue, buf);
>  }
>  
>  static int viacam_qbuf(struct file *filp, void *priv, struct v4l2_buffer *buf)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  
>  	return videobuf_qbuf(&cam->vb_queue, buf);
>  }
>  
>  static int viacam_dqbuf(struct file *filp, void *priv, struct v4l2_buffer *buf)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  
>  	return videobuf_dqbuf(&cam->vb_queue, buf, filp->f_flags & O_NONBLOCK);
>  }
>  
>  static int viacam_streamon(struct file *filp, void *priv, enum v4l2_buf_type t)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	int ret = 0;
>  
>  	if (t != V4L2_BUF_TYPE_VIDEO_CAPTURE)
> @@ -1084,7 +1091,7 @@ static int viacam_streamon(struct file *filp, void *priv, enum v4l2_buf_type t)
>  
>  static int viacam_streamoff(struct file *filp, void *priv, enum v4l2_buf_type t)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	int ret;
>  
>  	if (t != V4L2_BUF_TYPE_VIDEO_CAPTURE)
> @@ -1113,7 +1120,7 @@ static int viacam_streamoff(struct file *filp, void *priv, enum v4l2_buf_type t)
>  static int viacam_g_parm(struct file *filp, void *priv,
>  		struct v4l2_streamparm *parm)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	int ret;
>  
>  	mutex_lock(&cam->lock);
> @@ -1126,7 +1133,7 @@ static int viacam_g_parm(struct file *filp, void *priv,
>  static int viacam_s_parm(struct file *filp, void *priv,
>  		struct v4l2_streamparm *parm)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	int ret;
>  
>  	mutex_lock(&cam->lock);
> @@ -1153,7 +1160,7 @@ static int viacam_enum_framesizes(struct file *filp, void *priv,
>  static int viacam_enum_frameintervals(struct file *filp, void *priv,
>  		struct v4l2_frmivalenum *interval)
>  {
> -	struct via_camera *cam = priv;
> +	struct via_camera *cam = video_drvdata(filp);
>  	struct v4l2_subdev_frame_interval_enum fie = {
>  		.index = interval->index,
>  		.code = cam->mbus_code,
> @@ -1427,10 +1434,10 @@ static int viacam_probe(struct platform_device *pdev)
>  	 */
>  	cam->vdev = viacam_v4l_template;
>  	cam->vdev.v4l2_dev = &cam->v4l2_dev;
> +	video_set_drvdata(&cam->vdev, cam);
>  	ret = video_register_device(&cam->vdev, VFL_TYPE_GRABBER, -1);
>  	if (ret)
>  		goto out_irq;
> -	video_set_drvdata(&cam->vdev, cam);
>  
>  #ifdef CONFIG_PM
>  	/*



  reply	other threads:[~2019-07-21 14:30 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-17  9:03 [PATCH 0/4] via-camera/ov7670: various fixes/improvements Hans Verkuil
2019-07-17  9:03 ` [PATCH 1/4] via-camera: call viafb_pm_unregister in remove() Hans Verkuil
2019-07-17  9:03 ` [PATCH 2/4] via-camera: use struct v4l2_fh Hans Verkuil
2019-07-21 14:30   ` Ezequiel Garcia [this message]
2019-07-17  9:03 ` [PATCH 3/4] ov7670: don't return ENOTTY if SUBDEV_API is not set Hans Verkuil
2019-07-17  9:03 ` [PATCH 4/4] via-camera: fix v4l2-compliance fails Hans Verkuil

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b830214ec4878114395b32510b41d5861dd1fbea.camel@collabora.com \
    --to=ezequiel@collabora.com \
    --cc=corbet@lwn.net \
    --cc=hverkuil-cisco@xs4all.nl \
    --cc=linux-media@vger.kernel.org \
    --subject='Re: [PATCH 2/4] via-camera: use struct v4l2_fh' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).