linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set
@ 2019-07-17  9:24 Hans Verkuil
  2019-07-19  7:24 ` Lad, Prabhakar
  2019-07-19  7:52 ` Rui Miguel Silva
  0 siblings, 2 replies; 3+ messages in thread
From: Hans Verkuil @ 2019-07-17  9:24 UTC (permalink / raw)
  To: Linux Media Mailing List
  Cc: Laurent Pinchart, Sakari Ailus, Prabhakar Lad, Akinobu Mita,
	Eugen Hristev, Rui Miguel Silva

If CONFIG_VIDEO_V4L2_SUBDEV_API is not set, then it is still possible
to call set_fmt for V4L2_SUBDEV_FORMAT_TRY, the result is just not
stored. So return 0 instead of -ENOTTY.

Calling get_fmt with V4L2_SUBDEV_FORMAT_TRY should return -EINVAL
instead of -ENOTTY, after all the get_fmt functionality is still
present, just not supported for TRY.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
This was fixed for the ov7670 (https://patchwork.linuxtv.org/patch/57584/) when
working on the via-camera driver, but the same pattern is found in other drivers,
and those are fixed in this patch.
---
 drivers/media/i2c/mt9m111.c | 2 +-
 drivers/media/i2c/ov2640.c  | 2 +-
 drivers/media/i2c/ov2659.c  | 4 +---
 drivers/media/i2c/ov2680.c  | 5 +----
 drivers/media/i2c/ov5695.c  | 5 +----
 drivers/media/i2c/ov7740.c  | 8 ++------
 6 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
index d10fe3712036..d4864d155f0b 100644
--- a/drivers/media/i2c/mt9m111.c
+++ b/drivers/media/i2c/mt9m111.c
@@ -536,7 +536,7 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd,
 		format->format = *mf;
 		return 0;
 #else
-		return -ENOTTY;
+		return -EINVAL;
 #endif
 	}

diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
index 30e7e6b2b293..39474b287bb2 100644
--- a/drivers/media/i2c/ov2640.c
+++ b/drivers/media/i2c/ov2640.c
@@ -932,7 +932,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
 		format->format = *mf;
 		return 0;
 #else
-		return -ENOTTY;
+		return -EINVAL;
 #endif
 	}

diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
index 5ed2413eac8a..a71277e361ff 100644
--- a/drivers/media/i2c/ov2659.c
+++ b/drivers/media/i2c/ov2659.c
@@ -1055,7 +1055,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd,
 		mutex_unlock(&ov2659->lock);
 		return 0;
 #else
-	return -ENOTTY;
+		return -EINVAL;
 #endif
 	}

@@ -1131,8 +1131,6 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
 		mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
 		*mf = fmt->format;
-#else
-		ret = -ENOTTY;
 #endif
 	} else {
 		s64 val;
diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c
index b10bcfabaeeb..164f983c1814 100644
--- a/drivers/media/i2c/ov2680.c
+++ b/drivers/media/i2c/ov2680.c
@@ -675,7 +675,7 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd,
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
 		fmt = v4l2_subdev_get_try_format(&sensor->sd, cfg, format->pad);
 #else
-		ret = -ENOTTY;
+		ret = -EINVAL;
 #endif
 	} else {
 		fmt = &sensor->fmt;
@@ -723,10 +723,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
 		try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);
 		format->format = *try_fmt;
-#else
-		ret = -ENOTTY;
 #endif
-
 		goto unlock;
 	}

diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
index e65a94353175..34b7046d9702 100644
--- a/drivers/media/i2c/ov5695.c
+++ b/drivers/media/i2c/ov5695.c
@@ -823,9 +823,6 @@ static int ov5695_set_fmt(struct v4l2_subdev *sd,
 	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
 		*v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;
-#else
-		mutex_unlock(&ov5695->mutex);
-		return -ENOTTY;
 #endif
 	} else {
 		ov5695->cur_mode = mode;
@@ -856,7 +853,7 @@ static int ov5695_get_fmt(struct v4l2_subdev *sd,
 		fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
 #else
 		mutex_unlock(&ov5695->mutex);
-		return -ENOTTY;
+		return -EINVAL;
 #endif
 	} else {
 		fmt->format.width = mode->width;
diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
index 70bb870b1d08..a2f8f19bca7c 100644
--- a/drivers/media/i2c/ov7740.c
+++ b/drivers/media/i2c/ov7740.c
@@ -827,13 +827,9 @@ static int ov7740_set_fmt(struct v4l2_subdev *sd,
 #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
 		mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
 		*mbus_fmt = format->format;
-
+#endif
 		mutex_unlock(&ov7740->mutex);
 		return 0;
-#else
-		ret = -ENOTTY;
-		goto error;
-#endif
 	}

 	ret = ov7740_try_fmt_internal(sd, &format->format, &ovfmt, &fsize);
@@ -868,7 +864,7 @@ static int ov7740_get_fmt(struct v4l2_subdev *sd,
 		format->format = *mbus_fmt;
 		ret = 0;
 #else
-		ret = -ENOTTY;
+		ret = -EINVAL;
 #endif
 	} else {
 		format->format = ov7740->format;
-- 
2.20.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set
  2019-07-17  9:24 [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set Hans Verkuil
@ 2019-07-19  7:24 ` Lad, Prabhakar
  2019-07-19  7:52 ` Rui Miguel Silva
  1 sibling, 0 replies; 3+ messages in thread
From: Lad, Prabhakar @ 2019-07-19  7:24 UTC (permalink / raw)
  To: Hans Verkuil
  Cc: Linux Media Mailing List, Laurent Pinchart, Sakari Ailus,
	Akinobu Mita, Eugen Hristev, Rui Miguel Silva

Hi Hans,

Thank you for the patch.

On Wed, Jul 17, 2019 at 10:24 AM Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> If CONFIG_VIDEO_V4L2_SUBDEV_API is not set, then it is still possible
> to call set_fmt for V4L2_SUBDEV_FORMAT_TRY, the result is just not
> stored. So return 0 instead of -ENOTTY.
>
> Calling get_fmt with V4L2_SUBDEV_FORMAT_TRY should return -EINVAL
> instead of -ENOTTY, after all the get_fmt functionality is still
> present, just not supported for TRY.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> This was fixed for the ov7670 (https://patchwork.linuxtv.org/patch/57584/) when
> working on the via-camera driver, but the same pattern is found in other drivers,
> and those are fixed in this patch.
> ---
>  drivers/media/i2c/mt9m111.c | 2 +-
>  drivers/media/i2c/ov2640.c  | 2 +-
>  drivers/media/i2c/ov2659.c  | 4 +---

for ov2659 changes,

Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Cheers,
--Prabhakar Lad

>  drivers/media/i2c/ov2680.c  | 5 +----
>  drivers/media/i2c/ov5695.c  | 5 +----
>  drivers/media/i2c/ov7740.c  | 8 ++------
>  6 files changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
> index d10fe3712036..d4864d155f0b 100644
> --- a/drivers/media/i2c/mt9m111.c
> +++ b/drivers/media/i2c/mt9m111.c
> @@ -536,7 +536,7 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd,
>                 format->format = *mf;
>                 return 0;
>  #else
> -               return -ENOTTY;
> +               return -EINVAL;
>  #endif
>         }
>
> diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
> index 30e7e6b2b293..39474b287bb2 100644
> --- a/drivers/media/i2c/ov2640.c
> +++ b/drivers/media/i2c/ov2640.c
> @@ -932,7 +932,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
>                 format->format = *mf;
>                 return 0;
>  #else
> -               return -ENOTTY;
> +               return -EINVAL;
>  #endif
>         }
>
> diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
> index 5ed2413eac8a..a71277e361ff 100644
> --- a/drivers/media/i2c/ov2659.c
> +++ b/drivers/media/i2c/ov2659.c
> @@ -1055,7 +1055,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd,
>                 mutex_unlock(&ov2659->lock);
>                 return 0;
>  #else
> -       return -ENOTTY;
> +               return -EINVAL;
>  #endif
>         }
>
> @@ -1131,8 +1131,6 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>                 mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
>                 *mf = fmt->format;
> -#else
> -               ret = -ENOTTY;
>  #endif
>         } else {
>                 s64 val;
> diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c
> index b10bcfabaeeb..164f983c1814 100644
> --- a/drivers/media/i2c/ov2680.c
> +++ b/drivers/media/i2c/ov2680.c
> @@ -675,7 +675,7 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>                 fmt = v4l2_subdev_get_try_format(&sensor->sd, cfg, format->pad);
>  #else
> -               ret = -ENOTTY;
> +               ret = -EINVAL;
>  #endif
>         } else {
>                 fmt = &sensor->fmt;
> @@ -723,10 +723,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>                 try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);
>                 format->format = *try_fmt;
> -#else
> -               ret = -ENOTTY;
>  #endif
> -
>                 goto unlock;
>         }
>
> diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
> index e65a94353175..34b7046d9702 100644
> --- a/drivers/media/i2c/ov5695.c
> +++ b/drivers/media/i2c/ov5695.c
> @@ -823,9 +823,6 @@ static int ov5695_set_fmt(struct v4l2_subdev *sd,
>         if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>                 *v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;
> -#else
> -               mutex_unlock(&ov5695->mutex);
> -               return -ENOTTY;
>  #endif
>         } else {
>                 ov5695->cur_mode = mode;
> @@ -856,7 +853,7 @@ static int ov5695_get_fmt(struct v4l2_subdev *sd,
>                 fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
>  #else
>                 mutex_unlock(&ov5695->mutex);
> -               return -ENOTTY;
> +               return -EINVAL;
>  #endif
>         } else {
>                 fmt->format.width = mode->width;
> diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
> index 70bb870b1d08..a2f8f19bca7c 100644
> --- a/drivers/media/i2c/ov7740.c
> +++ b/drivers/media/i2c/ov7740.c
> @@ -827,13 +827,9 @@ static int ov7740_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>                 mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
>                 *mbus_fmt = format->format;
> -
> +#endif
>                 mutex_unlock(&ov7740->mutex);
>                 return 0;
> -#else
> -               ret = -ENOTTY;
> -               goto error;
> -#endif
>         }
>
>         ret = ov7740_try_fmt_internal(sd, &format->format, &ovfmt, &fsize);
> @@ -868,7 +864,7 @@ static int ov7740_get_fmt(struct v4l2_subdev *sd,
>                 format->format = *mbus_fmt;
>                 ret = 0;
>  #else
> -               ret = -ENOTTY;
> +               ret = -EINVAL;
>  #endif
>         } else {
>                 format->format = ov7740->format;
> --
> 2.20.1
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set
  2019-07-17  9:24 [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set Hans Verkuil
  2019-07-19  7:24 ` Lad, Prabhakar
@ 2019-07-19  7:52 ` Rui Miguel Silva
  1 sibling, 0 replies; 3+ messages in thread
From: Rui Miguel Silva @ 2019-07-19  7:52 UTC (permalink / raw)
  To: Hans Verkuil
  Cc: Linux Media Mailing List, Laurent Pinchart, Sakari Ailus,
	Prabhakar Lad, Akinobu Mita, Eugen Hristev

Hi Hans,
On Wed 17 Jul 2019 at 10:24, Hans Verkuil wrote:
> If CONFIG_VIDEO_V4L2_SUBDEV_API is not set, then it is still possible
> to call set_fmt for V4L2_SUBDEV_FORMAT_TRY, the result is just not
> stored. So return 0 instead of -ENOTTY.
>
> Calling get_fmt with V4L2_SUBDEV_FORMAT_TRY should return -EINVAL
> instead of -ENOTTY, after all the get_fmt functionality is still
> present, just not supported for TRY.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> This was fixed for the ov7670 (https://patchwork.linuxtv.org/patch/57584/) when
> working on the via-camera driver, but the same pattern is found in other drivers,
> and those are fixed in this patch.
> ---
>  drivers/media/i2c/mt9m111.c | 2 +-
>  drivers/media/i2c/ov2640.c  | 2 +-
>  drivers/media/i2c/ov2659.c  | 4 +---
>  drivers/media/i2c/ov2680.c  | 5 +----
>  drivers/media/i2c/ov5695.c  | 5 +----
>  drivers/media/i2c/ov7740.c  | 8 ++------
>  6 files changed, 7 insertions(+), 19 deletions(-)
>

for the ov2680:
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>

---
Cheers,
	Rui


> diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
> index d10fe3712036..d4864d155f0b 100644
> --- a/drivers/media/i2c/mt9m111.c
> +++ b/drivers/media/i2c/mt9m111.c
> @@ -536,7 +536,7 @@ static int mt9m111_get_fmt(struct v4l2_subdev *sd,
>  		format->format = *mf;
>  		return 0;
>  #else
> -		return -ENOTTY;
> +		return -EINVAL;
>  #endif
>  	}
>
> diff --git a/drivers/media/i2c/ov2640.c b/drivers/media/i2c/ov2640.c
> index 30e7e6b2b293..39474b287bb2 100644
> --- a/drivers/media/i2c/ov2640.c
> +++ b/drivers/media/i2c/ov2640.c
> @@ -932,7 +932,7 @@ static int ov2640_get_fmt(struct v4l2_subdev *sd,
>  		format->format = *mf;
>  		return 0;
>  #else
> -		return -ENOTTY;
> +		return -EINVAL;
>  #endif
>  	}
>
> diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c
> index 5ed2413eac8a..a71277e361ff 100644
> --- a/drivers/media/i2c/ov2659.c
> +++ b/drivers/media/i2c/ov2659.c
> @@ -1055,7 +1055,7 @@ static int ov2659_get_fmt(struct v4l2_subdev *sd,
>  		mutex_unlock(&ov2659->lock);
>  		return 0;
>  #else
> -	return -ENOTTY;
> +		return -EINVAL;
>  #endif
>  	}
>
> @@ -1131,8 +1131,6 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>  		mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
>  		*mf = fmt->format;
> -#else
> -		ret = -ENOTTY;
>  #endif
>  	} else {
>  		s64 val;
> diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c
> index b10bcfabaeeb..164f983c1814 100644
> --- a/drivers/media/i2c/ov2680.c
> +++ b/drivers/media/i2c/ov2680.c
> @@ -675,7 +675,7 @@ static int ov2680_get_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>  		fmt = v4l2_subdev_get_try_format(&sensor->sd, cfg, format->pad);
>  #else
> -		ret = -ENOTTY;
> +		ret = -EINVAL;
>  #endif
>  	} else {
>  		fmt = &sensor->fmt;
> @@ -723,10 +723,7 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>  		try_fmt = v4l2_subdev_get_try_format(sd, cfg, 0);
>  		format->format = *try_fmt;
> -#else
> -		ret = -ENOTTY;
>  #endif
> -
>  		goto unlock;
>  	}
>
> diff --git a/drivers/media/i2c/ov5695.c b/drivers/media/i2c/ov5695.c
> index e65a94353175..34b7046d9702 100644
> --- a/drivers/media/i2c/ov5695.c
> +++ b/drivers/media/i2c/ov5695.c
> @@ -823,9 +823,6 @@ static int ov5695_set_fmt(struct v4l2_subdev *sd,
>  	if (fmt->which == V4L2_SUBDEV_FORMAT_TRY) {
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>  		*v4l2_subdev_get_try_format(sd, cfg, fmt->pad) = fmt->format;
> -#else
> -		mutex_unlock(&ov5695->mutex);
> -		return -ENOTTY;
>  #endif
>  	} else {
>  		ov5695->cur_mode = mode;
> @@ -856,7 +853,7 @@ static int ov5695_get_fmt(struct v4l2_subdev *sd,
>  		fmt->format = *v4l2_subdev_get_try_format(sd, cfg, fmt->pad);
>  #else
>  		mutex_unlock(&ov5695->mutex);
> -		return -ENOTTY;
> +		return -EINVAL;
>  #endif
>  	} else {
>  		fmt->format.width = mode->width;
> diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
> index 70bb870b1d08..a2f8f19bca7c 100644
> --- a/drivers/media/i2c/ov7740.c
> +++ b/drivers/media/i2c/ov7740.c
> @@ -827,13 +827,9 @@ static int ov7740_set_fmt(struct v4l2_subdev *sd,
>  #ifdef CONFIG_VIDEO_V4L2_SUBDEV_API
>  		mbus_fmt = v4l2_subdev_get_try_format(sd, cfg, format->pad);
>  		*mbus_fmt = format->format;
> -
> +#endif
>  		mutex_unlock(&ov7740->mutex);
>  		return 0;
> -#else
> -		ret = -ENOTTY;
> -		goto error;
> -#endif
>  	}
>
>  	ret = ov7740_try_fmt_internal(sd, &format->format, &ovfmt, &fsize);
> @@ -868,7 +864,7 @@ static int ov7740_get_fmt(struct v4l2_subdev *sd,
>  		format->format = *mbus_fmt;
>  		ret = 0;
>  #else
> -		ret = -ENOTTY;
> +		ret = -EINVAL;
>  #endif
>  	} else {
>  		format->format = ov7740->format;


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-07-19  7:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-17  9:24 [PATCH] media/i2c: don't return ENOTTY if SUBDEV_API is not set Hans Verkuil
2019-07-19  7:24 ` Lad, Prabhakar
2019-07-19  7:52 ` Rui Miguel Silva

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).