Commit 6c492211 authored by Varsha Rao's avatar Varsha Rao Committed by Greg Kroah-Hartman

staging: media: atomisp: Removed unnecessary parentheses.

Removed parentheses on the right hand side of assignment, as they are
not required. The following coccinelle script is used to fix this issue:

@@
binary operator op = {<<,>>,+,/};
local idexpression id;
expression e1, e2;
@@

id =
-(
e1 op e2
-)
Signed-off-by: default avatarVarsha Rao <rvarsha016@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d89f191e
......@@ -904,13 +904,13 @@ static int gc0310_s_power(struct v4l2_subdev *sd, int on)
#define LARGEST_ALLOWED_RATIO_MISMATCH 800
static int distance(struct gc0310_resolution *res, u32 w, u32 h)
{
unsigned int w_ratio = ((res->width << 13)/w);
unsigned int w_ratio = (res->width << 13)/w;
unsigned int h_ratio;
int match;
if (h == 0)
return -1;
h_ratio = ((res->height << 13) / h);
h_ratio = (res->height << 13) / h;
if (h_ratio == 0)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192));
......
......@@ -697,13 +697,13 @@ static int gc2235_s_power(struct v4l2_subdev *sd, int on)
#define LARGEST_ALLOWED_RATIO_MISMATCH 800
static int distance(struct gc2235_resolution *res, u32 w, u32 h)
{
unsigned int w_ratio = ((res->width << 13)/w);
unsigned int w_ratio = (res->width << 13)/w;
unsigned int h_ratio;
int match;
if (h == 0)
return -1;
h_ratio = ((res->height << 13) / h);
h_ratio = (res->height << 13) / h;
if (h_ratio == 0)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192));
......
......@@ -1005,13 +1005,13 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on)
#define LARGEST_ALLOWED_RATIO_MISMATCH 600
static int distance(struct ov2680_resolution *res, u32 w, u32 h)
{
unsigned int w_ratio = ((res->width << 13)/w);
unsigned int w_ratio = (res->width << 13)/w;
unsigned int h_ratio;
int match;
if (h == 0)
return -1;
h_ratio = ((res->height << 13) / h);
h_ratio = (res->height << 13) / h;
if (h_ratio == 0)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192));
......
......@@ -801,13 +801,13 @@ static int ov2722_s_power(struct v4l2_subdev *sd, int on)
#define LARGEST_ALLOWED_RATIO_MISMATCH 800
static int distance(struct ov2722_resolution *res, u32 w, u32 h)
{
unsigned int w_ratio = ((res->width << 13)/w);
unsigned int w_ratio = (res->width << 13)/w;
unsigned int h_ratio;
int match;
if (h == 0)
return -1;
h_ratio = ((res->height << 13) / h);
h_ratio = (res->height << 13) / h;
if (h_ratio == 0)
return -1;
match = abs(((w_ratio << 13) / h_ratio) - ((int)8192));
......
......@@ -1506,7 +1506,7 @@ static int distance(struct ov5693_resolution *res, u32 w, u32 h)
res->width < w || res->height < h)
return -1;
ratio = (res->width << 13);
ratio = res->width << 13;
ratio /= w;
ratio *= h;
ratio /= res->height;
......
......@@ -1250,7 +1250,7 @@ static int distance(struct ov8858_resolution const *res, const u32 w,
res->width < w || res->height < h)
return -1;
ratio = (res->width << 13);
ratio = res->width << 13;
ratio /= w;
ratio *= h;
ratio /= res->height;
......
......@@ -45,7 +45,7 @@ bnlm_lut_encode(struct bnlm_lut *lut, const int32_t *lut_thr, const int32_t *lut
{
uint32_t blk, i;
const uint32_t block_size = 16;
const uint32_t total_blocks = (ISP_VEC_NELEMS / block_size);
const uint32_t total_blocks = ISP_VEC_NELEMS / block_size;
/* Create VMEM LUTs from the threshold and value arrays.
*
......
......@@ -50,7 +50,7 @@ ia_css_macc1_5_vmem_encode(
for (k = 0; k < 4; k++)
for (i = 0; i < IA_CSS_MACC_NUM_AXES; i++) {
idx = (idx_map[i] + (k*IA_CSS_MACC_NUM_AXES));
idx = idx_map[i] + (k*IA_CSS_MACC_NUM_AXES);
j = 4*i;
params->data[0][(idx)] = from->data[j];
......
......@@ -350,7 +350,7 @@ ia_css_s3a_vmem_decode(
hi = isp_stats_hi;
lo = isp_stats_lo;
chunk = (ISP_VEC_NELEMS >> host_stats->grid.deci_factor_log2);
chunk = ISP_VEC_NELEMS >> host_stats->grid.deci_factor_log2;
chunk = max(chunk, 1);
for (y = 0; y < out_height; y++) {
......
......@@ -210,18 +210,18 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,
*/
words_per_odd_line = ((odd_line_bytes + 3) >> 2); /* ceil(odd_line_bytes/4); word = 4 bytes */
words_per_even_line = ((even_line_bytes + 3) >> 2);
words_per_odd_line = (odd_line_bytes + 3) >> 2; /* ceil(odd_line_bytes/4); word = 4 bytes */
words_per_even_line = (even_line_bytes + 3) >> 2;
words_for_first_line = words_per_odd_line + 2 + (hasSOLandEOL ? 1 : 0);
/* + SOF +packet header + optionally (SOL), but (EOL) is not in the first line */
words_per_odd_line += (1 + (hasSOLandEOL ? 2 : 0));
/* each non-first line has format header, and optionally (SOL) and (EOL). */
words_per_even_line += (1 + (hasSOLandEOL ? 2 : 0));
mem_words_per_odd_line = ((words_per_odd_line + 7) >> 3);
mem_words_per_odd_line = (words_per_odd_line + 7) >> 3;
/* ceil(words_per_odd_line/8); mem_word = 32 bytes, 8 words */
mem_words_for_first_line = ((words_for_first_line + 7) >> 3);
mem_words_per_even_line = ((words_per_even_line + 7) >> 3);
mem_words_for_first_line = (words_for_first_line + 7) >> 3;
mem_words_per_even_line = (words_per_even_line + 7) >> 3;
mem_words_for_EOF = 1; /* last line consisit of the optional (EOL) and EOF */
mem_words = ((embedded_data_size_words + 7) >> 3) +
......@@ -364,13 +364,13 @@ calculate_mipi_buff_size(
even_line_bytes = odd_line_bytes;
}
words_per_odd_line = ((odd_line_bytes + 3) >> 2);
words_per_odd_line = (odd_line_bytes + 3) >> 2;
/* ceil(odd_line_bytes/4); word = 4 bytes */
words_per_even_line = ((even_line_bytes + 3) >> 2);
words_per_even_line = (even_line_bytes + 3) >> 2;
mem_words_per_odd_line = ((words_per_odd_line + 7) >> 3);
mem_words_per_odd_line = (words_per_odd_line + 7) >> 3;
/* ceil(words_per_odd_line/8); mem_word = 32 bytes, 8 words */
mem_words_per_even_line = ((words_per_even_line + 7) >> 3);
mem_words_per_even_line = (words_per_even_line + 7) >> 3;
mem_words_per_buff_line =
(mem_words_per_odd_line > mem_words_per_even_line) ? mem_words_per_odd_line : mem_words_per_even_line;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment