From d64fe06e1e4617865d7890b293990c100c72f086 Mon Sep 17 00:00:00 2001 From: Varsha Rao Date: Sun, 12 Mar 2017 21:47:04 +0530 Subject: [PATCH] staging: media: atomisp: Compress return logic into one line. Simplify function return by merging assignment and return into a single line. The following coccinelle script is used to fix this issue. @@ expression e; local idexpression ret; @@ -ret = e; -return ret; +return e; This patch also removes unnecessary declarations. Signed-off-by: Varsha Rao Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/atomisp/i2c/gc2235.c | 9 ++------- drivers/staging/media/atomisp/i2c/ov8858.c | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 4d15e205ee38..6a5a08e9a887 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -541,10 +541,7 @@ static int __gc2235_init(struct v4l2_subdev *sd) static int is_init; static int gc2235_init(struct v4l2_subdev *sd) { - int ret = 0; - ret = __gc2235_init(sd); - - return ret; + return __gc2235_init(sd); } static int power_ctrl(struct v4l2_subdev *sd, bool flag) @@ -585,9 +582,7 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag) ret |= dev->platform_data->gpio1_ctrl(sd, !flag); usleep_range(60, 90); - ret = dev->platform_data->gpio0_ctrl(sd, flag); - - return ret; + return dev->platform_data->gpio0_ctrl(sd, flag); } static int power_up(struct v4l2_subdev *sd) diff --git a/drivers/staging/media/atomisp/i2c/ov8858.c b/drivers/staging/media/atomisp/i2c/ov8858.c index cc7da2a4a84e..9574bc49113c 100644 --- a/drivers/staging/media/atomisp/i2c/ov8858.c +++ b/drivers/staging/media/atomisp/i2c/ov8858.c @@ -2206,9 +2206,7 @@ static struct i2c_driver ov8858_driver = { static __init int ov8858_init_mod(void) { - int ret; - ret = i2c_add_driver(&ov8858_driver); - return ret; + return i2c_add_driver(&ov8858_driver); } static __exit void ov8858_exit_mod(void) -- 2.11.0