staging: media: davinci_vpfe: Merge assignment with return

Instead of storing the return value into a variable and then returning it, we
can club the two into a single return statement. This change was made using
the following semantic patch by Coccinelle:

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Rehas Sachdeva <aquannie@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.c b/drivers/staging/media/davinci_vpfe/dm365_isif.c
index ae9202d..569bcdc 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/dm365_isif.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_isif.c
@@ -146,9 +146,8 @@ enum v4l2_field vpfe_isif_get_fid(struct vpfe_device *vpfe_dev)
        u32 field_status;
 
        field_status = isif_read(isif->isif_cfg.base_addr, MODESET);
-       field_status = (field_status >> DM365_ISIF_MDFS_OFFSET) &
-                       DM365_ISIF_MDFS_MASK;
-       return field_status;
+       return (field_status >> DM365_ISIF_MDFS_OFFSET) &
+               DM365_ISIF_MDFS_MASK;
 }
 
 static int
@@ -594,8 +593,7 @@ isif_validate_raw_params(struct vpfe_isif_raw_config *params)
        ret = isif_validate_dfc_params(&params->dfc);
        if (ret)
                return ret;
-       ret = isif_validate_bclamp_params(&params->bclamp);
-       return ret;
+       return isif_validate_bclamp_params(&params->bclamp);
 }
 
 static int isif_set_params(struct v4l2_subdev *sd, void *params)