diff options
5 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/media/atomisp/i2c/gc0310.c b/drivers/staging/media/atomisp/i2c/gc0310.c index 0644c6c85d10..2438dd00622f 100644 --- a/drivers/staging/media/atomisp/i2c/gc0310.c +++ b/drivers/staging/media/atomisp/i2c/gc0310.c @@ -904,7 +904,7 @@ 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; diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 6e01d00c52b3..9bb30c10c602 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -359,7 +359,7 @@ static long __gc2235_set_exposure(struct v4l2_subdev *sd, int coarse_itg, u16 coarse_integration = (u16)coarse_itg; int ret = 0; u16 expo_coarse_h, expo_coarse_l, gain_val = 0xF0, gain_val2 = 0xF0; - expo_coarse_h = coarse_integration>>8; + expo_coarse_h = coarse_integration >> 8; expo_coarse_l = coarse_integration & 0xff; ret = gc2235_write_reg(client, GC2235_8BIT, @@ -697,7 +697,7 @@ 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; diff --git a/drivers/staging/media/atomisp/i2c/ov2680.c b/drivers/staging/media/atomisp/i2c/ov2680.c index 434b6f868c44..5730fe58d52c 100644 --- a/drivers/staging/media/atomisp/i2c/ov2680.c +++ b/drivers/staging/media/atomisp/i2c/ov2680.c @@ -389,9 +389,9 @@ static int ov2680_get_intg_factor(struct i2c_client *client, buf->output_height = reg_val; buf->binning_factor_x = res->bin_factor_x ? - (res->bin_factor_x*2) : 1; + (res->bin_factor_x * 2) : 1; buf->binning_factor_y = res->bin_factor_y ? - (res->bin_factor_y*2) : 1; + (res->bin_factor_y * 2) : 1; return 0; } @@ -1005,7 +1005,7 @@ 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; diff --git a/drivers/staging/media/atomisp/i2c/ov2722.c b/drivers/staging/media/atomisp/i2c/ov2722.c index a75c6bec054f..4ff3dfde6172 100644 --- a/drivers/staging/media/atomisp/i2c/ov2722.c +++ b/drivers/staging/media/atomisp/i2c/ov2722.c @@ -328,7 +328,7 @@ static int ov2722_get_intg_factor(struct i2c_client *client, pll_multiplier = pll_multiplier & 0x7f; op_pix_clk_div = op_pix_clk_div & 0x03; pix_clk_freq_hz = ext_clk_freq_hz / pre_pll_clk_div * pll_multiplier - * op_pix_clk_div/pll_invariant_div; + * op_pix_clk_div / pll_invariant_div; dev->vt_pix_clk_freq_mhz = pix_clk_freq_hz; buf->vt_pix_clk_freq_mhz = pix_clk_freq_hz; @@ -801,7 +801,7 @@ 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; @@ -933,7 +933,7 @@ static int ov2722_set_fmt(struct v4l2_subdev *sd, for (i = 0; i < OV2722_POWER_UP_RETRY_NUM; i++) { dev_err(&client->dev, "ov2722 retry to power up %d/%d times, result: ", - i+1, OV2722_POWER_UP_RETRY_NUM); + i + 1, OV2722_POWER_UP_RETRY_NUM); power_down(sd); ret = power_up(sd); if (ret) { diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c index 96c81ad888c4..e8fab3754a1c 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c @@ -50,13 +50,13 @@ 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); - j = 4*i; + idx = idx_map[i] + (k * IA_CSS_MACC_NUM_AXES); + j = 4 * i; params->data[0][(idx)] = from->data[j]; - params->data[1][(idx)] = from->data[j+1]; - params->data[2][(idx)] = from->data[j+2]; - params->data[3][(idx)] = from->data[j+3]; + params->data[1][(idx)] = from->data[j + 1]; + params->data[2][(idx)] = from->data[j + 2]; + params->data[3][(idx)] = from->data[j + 3]; } } |