From 00987f507c865269f69c49b56f7f8f2aad19f2ad Mon Sep 17 00:00:00 2001
From: Varsha Rao <rvarsha016@gmail.com>
Date: Sun, 19 Mar 2017 18:06:24 +0530
Subject: [PATCH] staging: media: atomisp: Remove unnecessary braces.
Remove braces which are not required to fix the check patch issue. The
following coccinelle script is used to fix this issue.
@@
expression e,e1;
@@
if(e)
-{
e1;
-}
Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
.../atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 3 +--
.../css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 3 +--
.../staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
index 5d58dc178c19..07bd24edc7bf 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
@@ -52,9 +52,8 @@ static int ctc2_slope(int y1, int y0, int x1, int x0)
assert(x1 > 0 && x1 <= max_slope);
assert(dx > 0);
- if (dy < 0) {
+ if (dy < 0)
rounding = -rounding;
- }
slope = (int) (dy_shift + rounding) / dx;
/*the slope must lie within the range
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
index f61bfab8e442..955b6c8a8738 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c
@@ -97,9 +97,8 @@ compute_alpha(int sigma)
alpha = ((IA_CSS_XNR3_SIGMA_SCALE * XNR_ALPHA_SCALE_FACTOR) + offset)/ sigma;
#endif
- if (alpha > XNR_MAX_ALPHA) {
+ if (alpha > XNR_MAX_ALPHA)
alpha = XNR_MAX_ALPHA;
- }
}
return alpha;
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
index 8bc1ca07957f..7e3893c6c08a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c
@@ -79,9 +79,8 @@ static bool ia_css_mipi_is_source_port_valid(struct ia_css_pipe *pipe,
if (ret) {
assert(port < max_ports);
- if (port >= max_ports) {
+ if (port >= max_ports)
ret = false;
- }
}
*pport = port;