media: Staging: media: atomisp: Merge assignment with return

Merge the assignment and the return statements to return the value
directly. Done using the following semantic patch by coccinelle.

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Srishti Sharma <srishtishar@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
index 123642557aa8505f028570ce8ffee740dd8a0c0b..219501167584ac94ca034f2c96128a97e61970e7 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
+++ b/drivers/staging/media/atomisp/i2c/ov5693/ov5693.c
@@ -945,12 +945,8 @@ static int ad5823_t_focus_vcm(struct v4l2_subdev *sd, u16 val)
 
 int ad5823_t_focus_abs(struct v4l2_subdev *sd, s32 value)
 {
-       int ret;
-
        value = min(value, AD5823_MAX_FOCUS_POS);
-       ret = ad5823_t_focus_vcm(sd, value);
-
-       return ret;
+       return ad5823_t_focus_vcm(sd, value);
 }
 
 static int ov5693_t_focus_abs(struct v4l2_subdev *sd, s32 value)
@@ -1332,7 +1328,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
 
 static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
 {
-       int ret;
        struct ov5693_device *dev = to_ov5693_sensor(sd);
 
        if (!dev || !dev->platform_data)
@@ -1342,9 +1337,7 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)
        if (dev->platform_data->gpio_ctrl)
                return dev->platform_data->gpio_ctrl(sd, flag);
 
-       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/pci/atomisp2/hmm/hmm_bo.c b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
index 11162f595fc745846a11dd56d275e6b631ab249a..e6ddfbf0c4e2aa261839b0829a5daf136b72d270 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c
@@ -1168,13 +1168,9 @@ status_err2:
 
 int hmm_bo_page_allocated(struct hmm_buffer_object *bo)
 {
-       int ret;
-
        check_bo_null_return(bo, 0);
 
-       ret = bo->status & HMM_BO_PAGE_ALLOCED;
-
-       return ret;
+       return bo->status & HMM_BO_PAGE_ALLOCED;
 }
 
 /*