media: v4l2-ctrls: clean up some inconsistent indentings

[PATCH -next] media: v4l2-ctrls: clean up some inconsistent indentings

Posted by Yang Li 2 years, 9 months ago

clean up some inconsistent indentings to improve the readability of the
code.

drivers/media/v4l2-core/v4l2-ctrls-api.c:154 user_to_new() warn: inconsistent indenting

Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3503
Fixes: 73278d483378 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
Reported-by: Abaci Robot <abaci@linux.alibaba.com>
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
---
 drivers/media/v4l2-core/v4l2-ctrls-api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
index 3d3b6dc24ca6..3bee4ad5be7c 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls-api.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c
@@ -150,8 +150,8 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
 			 * then return an error.
 			 */
 			if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)
-			ctrl->is_new = 1;
-				return -ERANGE;
+				ctrl->is_new = 1;
+			return -ERANGE;
 		}
 		return ret;
 	default:
-- 
2.20.1.7.g153144c

Re: [PATCH -next] media: v4l2-ctrls: clean up some inconsistent indentings

Posted by Hans Verkuil 2 years, 7 months ago

On 16/12/2022 08:42, Yang Li wrote:
> clean up some inconsistent indentings to improve the readability of the
> code.
> 
> drivers/media/v4l2-core/v4l2-ctrls-api.c:154 user_to_new() warn: inconsistent indenting

Thank you for the patch, but the actual fix is already on its way
to mainline:

https://patchwork.linuxtv.org/project/linux-media/patch/69624c54-7cbd-7362-c468-f8ffea9614be@xs4all.nl/

Rejecting this in patchwork.

Regards,

	Hans

> 
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=3503
> Fixes: 73278d483378 ("media: v4l2-ctrls-api.c: add back dropped ctrl->is_new = 1")
> Reported-by: Abaci Robot <abaci@linux.alibaba.com>
> Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
> ---
>  drivers/media/v4l2-core/v4l2-ctrls-api.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/v4l2-core/v4l2-ctrls-api.c b/drivers/media/v4l2-core/v4l2-ctrls-api.c
> index 3d3b6dc24ca6..3bee4ad5be7c 100644
> --- a/drivers/media/v4l2-core/v4l2-ctrls-api.c
> +++ b/drivers/media/v4l2-core/v4l2-ctrls-api.c
> @@ -150,8 +150,8 @@ static int user_to_new(struct v4l2_ext_control *c, struct v4l2_ctrl *ctrl)
>  			 * then return an error.
>  			 */
>  			if (strlen(ctrl->p_new.p_char) == ctrl->maximum && last)
> -			ctrl->is_new = 1;
> -				return -ERANGE;
> +				ctrl->is_new = 1;
> +			return -ERANGE;
>  		}
>  		return ret;
>  	default: