aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarsha Rao <rvarsha016@gmail.com>2017-03-09 21:23:46 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-09 17:51:11 +0100
commit8284d2057ea9882f85275a446eb42501e87d4f75 (patch)
tree7f1d7cb6b49ae97e915fcb6c999cf7fe31e8fc77
parentstaging: media: atomisp: Remove useless cast. (diff)
staging: media: atomisp: Match alignment with open parenthesis.
This patch matches alignment with open parenthesis, removes extra space before '||' operators and fixes the checkpatch issue. Signed-off-by: Varsha Rao <rvarsha016@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/media/atomisp/i2c/gc2235.c4
-rw-r--r--drivers/staging/media/atomisp/i2c/mt9m114.c4
-rw-r--r--drivers/staging/media/atomisp/i2c/ov2722.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c
index 38f6de13f8fd..4d15e205ee38 100644
--- a/drivers/staging/media/atomisp/i2c/gc2235.c
+++ b/drivers/staging/media/atomisp/i2c/gc2235.c
@@ -704,8 +704,8 @@ static int distance(struct gc2235_resolution *res, u32 w, u32 h)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - 8192);
- if ((w_ratio < 8192) || (h_ratio < 8192) ||
- (match > LARGEST_ALLOWED_RATIO_MISMATCH))
+ if ((w_ratio < 8192) || (h_ratio < 8192) ||
+ (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1;
return w_ratio + h_ratio;
diff --git a/drivers/staging/media/atomisp/i2c/mt9m114.c b/drivers/staging/media/atomisp/i2c/mt9m114.c
index 9742293f0a80..1b79cdb27ce6 100644
--- a/drivers/staging/media/atomisp/i2c/mt9m114.c
+++ b/drivers/staging/media/atomisp/i2c/mt9m114.c
@@ -620,8 +620,8 @@ static int distance(struct mt9m114_res_struct const *res, u32 w, u32 h)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - 8192);
- if ((w_ratio < 8192) || (h_ratio < 8192) ||
- (match > LARGEST_ALLOWED_RATIO_MISMATCH))
+ if ((w_ratio < 8192) || (h_ratio < 8192) ||
+ (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1;
return w_ratio + h_ratio;
diff --git a/drivers/staging/media/atomisp/i2c/ov2722.c b/drivers/staging/media/atomisp/i2c/ov2722.c
index adf9766fbae1..b7afadebdf89 100644
--- a/drivers/staging/media/atomisp/i2c/ov2722.c
+++ b/drivers/staging/media/atomisp/i2c/ov2722.c
@@ -809,8 +809,8 @@ static int distance(struct ov2722_resolution *res, u32 w, u32 h)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - 8192);
- if ((w_ratio < 8192) || (h_ratio < 8192) ||
- (match > LARGEST_ALLOWED_RATIO_MISMATCH))
+ if ((w_ratio < 8192) || (h_ratio < 8192) ||
+ (match > LARGEST_ALLOWED_RATIO_MISMATCH))
return -1;
return w_ratio + h_ratio;