linux-media.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] media/v4l2-ctrls: Code cleanout validate_new()
@ 2015-06-10 13:38 Ricardo Ribalda Delgado
  2015-06-12  8:38 ` Hans Verkuil
  0 siblings, 1 reply; 2+ messages in thread
From: Ricardo Ribalda Delgado @ 2015-06-10 13:38 UTC (permalink / raw)
  To: Mauro Carvalho Chehab, Hans Verkuil, Sylwester Nawrocki,
	Sakari Ailus, linux-media
  Cc: Ricardo Ribalda Delgado

We can simplify the code removing the if().

v4l2_ctr_new sets ctrls->elems to 1 when !ctrl->is_ptr.

Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
---
 drivers/media/v4l2-core/v4l2-ctrls.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index e3a3468002e6..b6b7dcc1b77d 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1678,21 +1678,6 @@ static int validate_new(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr p_new)
 	unsigned idx;
 	int err = 0;
 
-	if (!ctrl->is_ptr) {
-		switch (ctrl->type) {
-		case V4L2_CTRL_TYPE_INTEGER:
-		case V4L2_CTRL_TYPE_INTEGER_MENU:
-		case V4L2_CTRL_TYPE_MENU:
-		case V4L2_CTRL_TYPE_BITMASK:
-		case V4L2_CTRL_TYPE_BOOLEAN:
-		case V4L2_CTRL_TYPE_BUTTON:
-		case V4L2_CTRL_TYPE_CTRL_CLASS:
-		case V4L2_CTRL_TYPE_INTEGER64:
-			return ctrl->type_ops->validate(ctrl, 0, p_new);
-		default:
-			break;
-		}
-	}
 	for (idx = 0; !err && idx < ctrl->elems; idx++)
 		err = ctrl->type_ops->validate(ctrl, idx, p_new);
 	return err;
-- 
2.1.4

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

* Re: [PATCH] media/v4l2-ctrls: Code cleanout validate_new()
  2015-06-10 13:38 [PATCH] media/v4l2-ctrls: Code cleanout validate_new() Ricardo Ribalda Delgado
@ 2015-06-12  8:38 ` Hans Verkuil
  0 siblings, 0 replies; 2+ messages in thread
From: Hans Verkuil @ 2015-06-12  8:38 UTC (permalink / raw)
  To: Ricardo Ribalda Delgado, Mauro Carvalho Chehab, Hans Verkuil,
	Sylwester Nawrocki, Sakari Ailus, linux-media

On 06/10/2015 03:38 PM, Ricardo Ribalda Delgado wrote:
> We can simplify the code removing the if().
> 
> v4l2_ctr_new sets ctrls->elems to 1 when !ctrl->is_ptr.
> 
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>

Acked-by: Hans Verkuil <hans.verkuil@cisco.com>

Thanks!

	Hans

> ---
>  drivers/media/v4l2-core/v4l2-ctrls.c | 15 ---------------
>  1 file changed, 15 deletions(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
> index e3a3468002e6..b6b7dcc1b77d 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
> @@ -1678,21 +1678,6 @@ static int validate_new(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr p_new)
>  	unsigned idx;
>  	int err = 0;
>  
> -	if (!ctrl->is_ptr) {
> -		switch (ctrl->type) {
> -		case V4L2_CTRL_TYPE_INTEGER:
> -		case V4L2_CTRL_TYPE_INTEGER_MENU:
> -		case V4L2_CTRL_TYPE_MENU:
> -		case V4L2_CTRL_TYPE_BITMASK:
> -		case V4L2_CTRL_TYPE_BOOLEAN:
> -		case V4L2_CTRL_TYPE_BUTTON:
> -		case V4L2_CTRL_TYPE_CTRL_CLASS:
> -		case V4L2_CTRL_TYPE_INTEGER64:
> -			return ctrl->type_ops->validate(ctrl, 0, p_new);
> -		default:
> -			break;
> -		}
> -	}
>  	for (idx = 0; !err && idx < ctrl->elems; idx++)
>  		err = ctrl->type_ops->validate(ctrl, idx, p_new);
>  	return err;
> 

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

end of thread, other threads:[~2015-06-12  8:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-10 13:38 [PATCH] media/v4l2-ctrls: Code cleanout validate_new() Ricardo Ribalda Delgado
2015-06-12  8:38 ` Hans Verkuil

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