diff options
| author | Varsha Rao <rvarsha016@gmail.com> | 2017-03-12 21:47:04 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-14 08:00:37 +0800 |
| commit | d64fe06e1e4617865d7890b293990c100c72f086 (patch) | |
| tree | 6f82ed075a1625450c25016b7d77bc759feb639f /drivers/staging/media/atomisp | |
| parent | 87bb40171cf75e46076dfd18b5801021eb4873f2 (diff) | |
| download | op-kernel-dev-d64fe06e1e4617865d7890b293990c100c72f086.zip op-kernel-dev-d64fe06e1e4617865d7890b293990c100c72f086.tar.gz | |
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 <rvarsha016@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp')
| -rw-r--r-- | drivers/staging/media/atomisp/i2c/gc2235.c | 9 | ||||
| -rw-r--r-- | 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 4d15e20..6a5a08e 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 cc7da2a..9574bc4 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) |
