* [PATCH 1/3] staging: media: atomisp: Fix braces on incorrect lines
2026-02-09 14:29 [PATCH 0/3] staging: media: atomisp: Fix brace style issues Matt Wardle
@ 2026-02-09 14:29 ` Matt Wardle
2026-02-09 15:42 ` Andy Shevchenko
2026-02-09 14:29 ` [PATCH 2/3] staging: media: atomisp: Remove braces for single statement blocks Matt Wardle
2026-02-09 14:29 ` [PATCH 3/3] staging: media: atomisp: Fix missing braces for " Matt Wardle
2 siblings, 1 reply; 8+ messages in thread
From: Matt Wardle @ 2026-02-09 14:29 UTC (permalink / raw)
To: Hans de Goede, Mauro Carvalho Chehab, Andy Shevchenko
Cc: Sakari Ailus, Greg Kroah-Hartman, linux-media, linux-staging,
linux-kernel, Matt Wardle
Fix checkpatch.pl errors:
ERROR: open brace '{' following function definitions go on the next line
ERROR: that open brace { should be on the previous line
Signed-off-by: Matt Wardle <matt@mattwardle.net>
---
.../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 6 +-
.../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 6 +-
.../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 9 +--
.../isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 9 ++-
.../atomisp/pci/runtime/binary/src/binary.c | 75 ++++++++-----------
.../pci/runtime/isp_param/src/isp_param.c | 12 +--
drivers/staging/media/atomisp/pci/sh_css.c | 6 +-
7 files changed, 53 insertions(+), 70 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
index e9d6dd0bbfe2..8d37bcb034d1 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c
@@ -263,7 +263,8 @@ store_dvs_6axis_config(
const struct ia_css_dvs_6axis_config *dvs_6axis_config,
const struct ia_css_binary *binary,
const struct ia_css_frame_info *dvs_in_frame_info,
- ia_css_ptr ddr_addr_y) {
+ ia_css_ptr ddr_addr_y)
+{
struct ia_css_host_data *me;
assert(dvs_6axis_config);
@@ -274,8 +275,7 @@ store_dvs_6axis_config(
binary,
dvs_in_frame_info);
- if (!me)
- {
+ if (!me) {
IA_CSS_LEAVE_ERR_PRIVATE(-ENOMEM);
return -ENOMEM;
}
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
index a00f8d049a33..987876b42e6d 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c
@@ -22,9 +22,9 @@ static const struct ia_css_raw_configuration default_config = {
/* MW: These areMIPI / ISYS properties, not camera function properties */
static enum sh_stream_format
-css2isp_stream_format(enum atomisp_input_format from) {
- switch (from)
- {
+css2isp_stream_format(enum atomisp_input_format from)
+{
+ switch (from) {
case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:
return sh_stream_format_yuv420_legacy;
case ATOMISP_INPUT_FORMAT_YUV420_8:
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
index 027eae0ca69e..c30533723899 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c
@@ -167,7 +167,8 @@ void ia_css_sdis2_clear_coefficients(
int
ia_css_get_dvs2_statistics(
struct ia_css_dvs2_statistics *host_stats,
- const struct ia_css_isp_dvs_statistics *isp_stats) {
+ const struct ia_css_isp_dvs_statistics *isp_stats)
+{
struct ia_css_isp_dvs_statistics_map *map;
int ret = 0;
@@ -177,13 +178,11 @@ ia_css_get_dvs2_statistics(
assert(isp_stats);
map = ia_css_isp_dvs_statistics_map_allocate(isp_stats, NULL);
- if (map)
- {
+ if (map) {
hmm_load(isp_stats->data_ptr, map->data_ptr, isp_stats->size);
ia_css_translate_dvs2_statistics(host_stats, map);
ia_css_isp_dvs_statistics_map_free(map);
- } else
- {
+ } else {
IA_CSS_ERROR("out of memory");
ret = -ENOMEM;
}
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
index 3c675063c4a7..940b5767954c 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c
@@ -49,7 +49,8 @@ int
sh_css_vf_downscale_log2(
const struct ia_css_frame_info *out_info,
const struct ia_css_frame_info *vf_info,
- unsigned int *downscale_log2) {
+ unsigned int *downscale_log2)
+{
unsigned int ds_log2 = 0;
unsigned int out_width;
@@ -65,8 +66,7 @@ sh_css_vf_downscale_log2(
* test for the height since the vmem buffers only put restrictions on
* the width of a line, not on the number of lines in a frame.
*/
- while (out_width >= vf_info->res.width)
- {
+ while (out_width >= vf_info->res.width) {
ds_log2++;
out_width /= 2;
}
@@ -86,7 +86,8 @@ configure_kernel(
const struct ia_css_frame_info *out_info,
const struct ia_css_frame_info *vf_info,
unsigned int *downscale_log2,
- struct ia_css_vf_configuration *config) {
+ struct ia_css_vf_configuration *config)
+{
int err;
unsigned int vf_log_ds = 0;
diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
index af93ca96747c..315cce008d3c 100644
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -350,7 +350,8 @@ ia_css_binary_dvs_stat_grid_info(
int
ia_css_binary_3a_grid_info(const struct ia_css_binary *binary,
struct ia_css_grid_info *info,
- struct ia_css_pipe *pipe) {
+ struct ia_css_pipe *pipe)
+{
struct ia_css_3a_grid_info *s3a_info;
int err = 0;
@@ -441,7 +442,8 @@ supports_bds_factor(u32 supported_factors,
static int
binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
- bool *binary_found) {
+ bool *binary_found)
+{
const unsigned char *blob = sh_css_blob_info[i].blob;
unsigned int size = sh_css_blob_info[i].header.blob.size;
@@ -465,7 +467,8 @@ binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
* be selected if no other primary matches.
*/
int
-ia_css_binary_init_infos(void) {
+ia_css_binary_init_infos(void)
+{
unsigned int i;
unsigned int num_of_isp_binaries = sh_css_num_binaries - NUM_OF_SPS - NUM_OF_BLS;
@@ -477,8 +480,7 @@ ia_css_binary_init_infos(void) {
if (!all_binaries)
return -ENOMEM;
- for (i = 0; i < num_of_isp_binaries; i++)
- {
+ for (i = 0; i < num_of_isp_binaries; i++) {
int ret;
struct ia_css_binary_xinfo *binary = &all_binaries[i];
bool binary_found;
@@ -498,12 +500,12 @@ ia_css_binary_init_infos(void) {
}
int
-ia_css_binary_uninit(void) {
+ia_css_binary_uninit(void)
+{
unsigned int i;
struct ia_css_binary_xinfo *b;
- for (i = 0; i < IA_CSS_BINARY_NUM_MODES; i++)
- {
+ for (i = 0; i < IA_CSS_BINARY_NUM_MODES; i++) {
for (b = binary_infos[i]; b; b = b->next) {
if (b->xmem_addr)
hmm_free(b->xmem_addr);
@@ -637,7 +639,8 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
struct ia_css_binary *binary,
struct ia_css_resolution *dvs_env,
int stream_config_left_padding,
- bool accelerator) {
+ bool accelerator)
+{
const struct ia_css_binary_info *info = &xinfo->sp;
unsigned int dvs_env_width = 0,
dvs_env_height = 0,
@@ -664,8 +667,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
assert(binary);
binary->info = xinfo;
- if (!accelerator)
- {
+ if (!accelerator) {
/* binary->css_params has been filled by accelerator itself. */
err = ia_css_isp_param_allocate_isp_parameters(
&binary->mem_params, &binary->css_params,
@@ -674,15 +676,13 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
return err;
}
}
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
- {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
if (out_info[i] && (out_info[i]->res.width != 0)) {
bin_out_info = out_info[i];
break;
}
}
- if (in_info && bin_out_info)
- {
+ if (in_info && bin_out_info) {
need_scaling = (in_info->res.width != bin_out_info->res.width) ||
(in_info->res.height != bin_out_info->res.height);
}
@@ -713,8 +713,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
binary->internal_frame_info.res.height = isp_internal_height;
binary->internal_frame_info.raw_bit_depth = bits_per_pixel;
- if (in_info)
- {
+ if (in_info) {
binary->effective_in_frame_res.width = in_info->res.width;
binary->effective_in_frame_res.height = in_info->res.height;
@@ -742,15 +741,13 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
binary->in_frame_info.crop_info = in_info->crop_info;
}
- if (online)
- {
+ if (online) {
bits_per_pixel = ia_css_util_input_format_bpp(
stream_format, two_ppc);
}
binary->in_frame_info.raw_bit_depth = bits_per_pixel;
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
- {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
if (out_info[i]) {
binary->out_frame_info[i].res.width = out_info[i]->res.width;
binary->out_frame_info[i].res.height = out_info[i]->res.height;
@@ -769,8 +766,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
}
}
- if (vf_info && (vf_info->res.width != 0))
- {
+ if (vf_info && (vf_info->res.width != 0)) {
err = ia_css_vf_configure(binary, bin_out_info,
(struct ia_css_frame_info *)vf_info, &vf_log_ds);
if (err) {
@@ -788,8 +784,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
binary->input_format = stream_format;
/* viewfinder output info */
- if ((vf_info) && (vf_info->res.width != 0))
- {
+ if ((vf_info) && (vf_info->res.width != 0)) {
unsigned int vf_out_vecs, vf_out_width, vf_out_height;
binary->vf_frame_info.format = vf_info->format;
@@ -821,23 +816,20 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
binary->vf_frame_info.padded_width = vf_out_width;
binary->vf_frame_info.res.height = vf_out_height;
}
- } else
- {
+ } else {
binary->vf_frame_info.res.width = 0;
binary->vf_frame_info.padded_width = 0;
binary->vf_frame_info.res.height = 0;
}
- if (info->enable.ca_gdc)
- {
+ if (info->enable.ca_gdc) {
binary->morph_tbl_width =
_ISP_MORPH_TABLE_WIDTH(isp_internal_width);
binary->morph_tbl_aligned_width =
_ISP_MORPH_TABLE_ALIGNED_WIDTH(isp_internal_width);
binary->morph_tbl_height =
_ISP_MORPH_TABLE_HEIGHT(isp_internal_height);
- } else
- {
+ } else {
binary->morph_tbl_width = 0;
binary->morph_tbl_aligned_width = 0;
binary->morph_tbl_height = 0;
@@ -847,8 +839,7 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
sc_3a_dis_padded_width = binary->in_frame_info.padded_width;
sc_3a_dis_height = binary->in_frame_info.res.height;
if (bds_out_info && in_info &&
- bds_out_info->res.width != in_info->res.width)
- {
+ bds_out_info->res.width != in_info->res.width) {
/* TODO: Next, "internal_frame_info" should be derived from
* bds_out. So this part will change once it is in place! */
sc_3a_dis_width = bds_out_info->res.width + info->pipeline.left_cropping;
@@ -858,18 +849,15 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
s3a_isp_width = _ISP_S3A_ELEMS_ISP_WIDTH(sc_3a_dis_padded_width,
info->pipeline.left_cropping);
- if (info->s3a.fixed_s3a_deci_log)
- {
+ if (info->s3a.fixed_s3a_deci_log) {
s3a_log_deci = info->s3a.fixed_s3a_deci_log;
- } else
- {
+ } else {
s3a_log_deci = binary_grid_deci_factor_log2(s3a_isp_width,
sc_3a_dis_height);
}
binary->deci_factor_log2 = s3a_log_deci;
- if (info->enable.s3a)
- {
+ if (info->enable.s3a) {
binary->s3atbl_width =
_ISP_S3ATBL_WIDTH(sc_3a_dis_width,
s3a_log_deci);
@@ -882,21 +870,18 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
binary->s3atbl_isp_height =
_ISP_S3ATBL_ISP_HEIGHT(sc_3a_dis_height,
s3a_log_deci);
- } else
- {
+ } else {
binary->s3atbl_width = 0;
binary->s3atbl_height = 0;
binary->s3atbl_isp_width = 0;
binary->s3atbl_isp_height = 0;
}
- if (info->enable.sc)
- {
+ if (info->enable.sc) {
binary->sctbl_width_per_color = _ISP_SCTBL_WIDTH_PER_COLOR(sc_3a_dis_padded_width, s3a_log_deci);
binary->sctbl_aligned_width_per_color = SH_CSS_MAX_SCTBL_ALIGNED_WIDTH_PER_COLOR;
binary->sctbl_height = _ISP_SCTBL_HEIGHT(sc_3a_dis_height, s3a_log_deci);
- } else
- {
+ } else {
binary->sctbl_width_per_color = 0;
binary->sctbl_aligned_width_per_color = 0;
binary->sctbl_height = 0;
diff --git a/drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c b/drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
index 251dd75a7613..f21797598cd5 100644
--- a/drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
+++ b/drivers/staging/media/atomisp/pci/runtime/isp_param/src/isp_param.c
@@ -97,13 +97,13 @@ int
ia_css_isp_param_allocate_isp_parameters(
struct ia_css_isp_param_host_segments *mem_params,
struct ia_css_isp_param_css_segments *css_params,
- const struct ia_css_isp_param_isp_segments *mem_initializers) {
+ const struct ia_css_isp_param_isp_segments *mem_initializers)
+{
int err = 0;
unsigned int mem, pclass;
pclass = IA_CSS_PARAM_CLASS_PARAM;
- for (mem = 0; mem < IA_CSS_NUM_MEMORIES; mem++)
- {
+ for (mem = 0; mem < IA_CSS_NUM_MEMORIES; mem++) {
for (pclass = 0; pclass < IA_CSS_NUM_PARAM_CLASSES; pclass++) {
u32 size = 0;
@@ -175,11 +175,11 @@ int
ia_css_isp_param_copy_isp_mem_if_to_ddr(
struct ia_css_isp_param_css_segments *ddr,
const struct ia_css_isp_param_host_segments *host,
- enum ia_css_param_class pclass) {
+ enum ia_css_param_class pclass)
+{
unsigned int mem;
- for (mem = 0; mem < N_IA_CSS_ISP_MEMORIES; mem++)
- {
+ for (mem = 0; mem < N_IA_CSS_ISP_MEMORIES; mem++) {
size_t size = host->params[pclass][mem].size;
ia_css_ptr ddr_mem_ptr = ddr->params[pclass][mem].address;
char *host_mem_ptr = host->params[pclass][mem].address;
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c
index 73bd87f43a8c..e7f2443696d1 100644
--- a/drivers/staging/media/atomisp/pci/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/sh_css.c
@@ -2256,8 +2256,7 @@ alloc_continuous_frames(struct ia_css_pipe *pipe, bool init_time)
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"alloc_continuous_frames() IA_CSS_FRAME_FORMAT_RAW_PACKED\n");
ref_info.format = IA_CSS_FRAME_FORMAT_RAW_PACKED;
- } else
- {
+ } else {
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
"alloc_continuous_frames() IA_CSS_FRAME_FORMAT_RAW\n");
ref_info.format = IA_CSS_FRAME_FORMAT_RAW;
@@ -7862,8 +7861,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
/* check if mipi size specified */
if (stream_config->mode == IA_CSS_INPUT_MODE_BUFFERED_SENSOR)
- if (!IS_ISP2401 || !stream_config->online)
- {
+ if (!IS_ISP2401 || !stream_config->online) {
unsigned int port = (unsigned int)stream_config->source.port.port;
if (port >= N_MIPI_PORT_ID) {
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] staging: media: atomisp: Remove braces for single statement blocks
2026-02-09 14:29 [PATCH 0/3] staging: media: atomisp: Fix brace style issues Matt Wardle
2026-02-09 14:29 ` [PATCH 1/3] staging: media: atomisp: Fix braces on incorrect lines Matt Wardle
@ 2026-02-09 14:29 ` Matt Wardle
2026-02-09 15:37 ` Andy Shevchenko
2026-02-09 14:29 ` [PATCH 3/3] staging: media: atomisp: Fix missing braces for " Matt Wardle
2 siblings, 1 reply; 8+ messages in thread
From: Matt Wardle @ 2026-02-09 14:29 UTC (permalink / raw)
To: Hans de Goede, Mauro Carvalho Chehab, Andy Shevchenko
Cc: Sakari Ailus, Greg Kroah-Hartman, linux-media, linux-staging,
linux-kernel, Matt Wardle
Fix checkpatch.pl warnings:
WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement
Signed-off-by: Matt Wardle <matt@mattwardle.net>
---
.../base/circbuf/interface/ia_css_circbuf.h | 3 +-
.../circbuf/interface/ia_css_circbuf_desc.h | 3 +-
.../atomisp/pci/base/refcount/src/refcount.c | 3 +-
.../pci/camera/pipe/src/pipe_stagedesc.c | 9 ++----
.../atomisp/pci/camera/pipe/src/pipe_util.c | 3 +-
.../host/isys_stream2mmio_private.h | 3 +-
.../host/event_fifo_private.h | 3 +-
.../host/input_formatter.c | 3 +-
.../hive_isp_css_common/host/input_system.c | 14 ++++-----
.../pci/hive_isp_css_common/host/irq.c | 30 ++++++++-----------
.../pci/hive_isp_css_common/host/mmu.c | 3 +-
.../pci/hive_isp_css_common/host/vmem.c | 4 +--
.../isp/kernels/anr/anr_2/ia_css_anr2.host.c | 3 +-
.../pci/isp/kernels/bnlm/ia_css_bnlm.host.c | 6 ++--
.../isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 7 ++---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 13 ++++----
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 3 +-
.../kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 6 ++--
.../atomisp/pci/runtime/binary/src/binary.c | 3 +-
.../pci/runtime/debug/src/ia_css_debug.c | 6 ++--
.../pci/runtime/isys/src/virtual_isys.c | 3 +-
.../pci/runtime/pipeline/src/pipeline.c | 3 +-
.../staging/media/atomisp/pci/sh_css_params.c | 12 +++-----
23 files changed, 53 insertions(+), 93 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
index 86300991d30e..148f9f6febfb 100644
--- a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
+++ b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf.h
@@ -146,9 +146,8 @@ static inline uint8_t ia_css_circbuf_get_pos_at_offset(
OP___assert(cb->desc->size > 0);
/* step 1: adjudst the offset */
- while (offset < 0) {
+ while (offset < 0)
offset += cb->desc->size;
- }
/* step 2: shift and round by the upper limit */
dest = OP_std_modadd(base, offset, cb->desc->size);
diff --git a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
index 5645a7bf493c..3d89626a0733 100644
--- a/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
+++ b/drivers/staging/media/atomisp/pci/base/circbuf/interface/ia_css_circbuf_desc.h
@@ -84,9 +84,8 @@ static inline uint8_t ia_css_circbuf_desc_get_pos_at_offset(
OP___assert(cb_desc->size > 0);
/* step 1: adjust the offset */
- while (offset < 0) {
+ while (offset < 0)
offset += cb_desc->size;
- }
/* step 2: shift and round by the upper limit */
dest = OP_std_modadd(base, offset, cb_desc->size);
diff --git a/drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c b/drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
index 58e4e3173b40..4a8675d0129a 100644
--- a/drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
+++ b/drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c
@@ -238,9 +238,8 @@ void ia_css_refcount_clear(s32 id, clear_func clear_func_ptr)
hmm_free(entry->data);
}
- if (entry->count != 0) {
+ if (entry->count != 0)
IA_CSS_WARNING("Ref count for entry %x is not zero!", entry->id);
- }
assert(entry->count == 0);
diff --git a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
index a9f736398f50..fa2f8ed5b053 100644
--- a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
+++ b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_stagedesc.c
@@ -32,9 +32,8 @@ void ia_css_pipe_get_generic_stage_desc(
stage_desc->max_input_width = 0;
stage_desc->mode = binary->info->sp.pipeline.mode;
stage_desc->in_frame = in_frame;
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
stage_desc->out_frame[i] = out_frame[i];
- }
stage_desc->vf_frame = vf_frame;
ERR:
IA_CSS_LEAVE_PRIVATE("");
@@ -59,9 +58,8 @@ void ia_css_pipe_get_firmwares_stage_desc(
stage_desc->max_input_width = 0;
stage_desc->mode = mode;
stage_desc->in_frame = in_frame;
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
stage_desc->out_frame[i] = out_frame[i];
- }
stage_desc->vf_frame = vf_frame;
}
@@ -82,8 +80,7 @@ void ia_css_pipe_get_sp_func_stage_desc(
stage_desc->mode = (unsigned int)-1;
stage_desc->in_frame = NULL;
stage_desc->out_frame[0] = out_frame;
- for (i = 1; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
+ for (i = 1; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
stage_desc->out_frame[i] = NULL;
- }
stage_desc->vf_frame = NULL;
}
diff --git a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
index c7c42b472cc7..6cb3ecbd7297 100644
--- a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
+++ b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_util.c
@@ -26,9 +26,8 @@ void ia_css_pipe_util_create_output_frames(
unsigned int i;
assert(frames);
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
frames[i] = NULL;
- }
}
void ia_css_pipe_util_set_output_frames(
diff --git a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h
index 3210dd6bf9ca..8e295cd78129 100644
--- a/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h
+++ b/drivers/staging/media/atomisp/pci/css_2401_system/host/isys_stream2mmio_private.h
@@ -41,9 +41,8 @@ STORAGE_CLASS_STREAM2MMIO_C void stream2mmio_get_state(
* Get the values of the register-set per
* stream2mmio-controller sids.
*/
- for (i = STREAM2MMIO_SID0_ID; i < N_STREAM2MMIO_SID_PROCS[ID]; i++) {
+ for (i = STREAM2MMIO_SID0_ID; i < N_STREAM2MMIO_SID_PROCS[ID]; i++)
stream2mmio_get_sid_state(ID, i, &state->sid_state[i]);
- }
}
/**
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
index 439c69444942..e77d7cf61356 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/event_fifo_private.h
@@ -26,9 +26,8 @@ STORAGE_CLASS_EVENT_C void event_wait_for(const event_ID_t ID)
STORAGE_CLASS_EVENT_C void cnd_event_wait_for(const event_ID_t ID,
const bool cnd)
{
- if (cnd) {
+ if (cnd)
event_wait_for(ID);
- }
}
STORAGE_CLASS_EVENT_C hrt_data event_receive_token(const event_ID_t ID)
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
index 40b3f1e48c56..c353461dcdf2 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c
@@ -62,9 +62,8 @@ void input_formatter_rst(
* WICH USES THE STREAM2MEMRY BLOCK.
* MUST BE FIXED PROPERLY
*/
- if (!HIVE_IF_BIN_COPY[ID]) {
+ if (!HIVE_IF_BIN_COPY[ID])
input_formatter_reg_store(ID, addr, rst);
- }
return;
}
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
index 9f1199c4761c..68b0ad27615d 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c
@@ -138,11 +138,10 @@ void receiver_port_enable(
hrt_data reg = receiver_port_reg_load(ID, port_ID,
_HRT_CSS_RECEIVER_DEVICE_READY_REG_IDX);
- if (cnd) {
+ if (cnd)
reg |= 0x01;
- } else {
+ else
reg &= ~0x01;
- }
receiver_port_reg_store(ID, port_ID,
_HRT_CSS_RECEIVER_DEVICE_READY_REG_IDX, reg);
@@ -194,9 +193,8 @@ static void receiver_rst(
assert(ID < N_RX_ID);
// Disable all ports.
- for (port_id = MIPI_PORT0_ID; port_id < N_MIPI_PORT_ID; port_id++) {
+ for (port_id = MIPI_PORT0_ID; port_id < N_MIPI_PORT_ID; port_id++)
receiver_port_enable(ID, port_id, false);
- }
// AM: Additional actions for stopping receiver?
}
@@ -830,15 +828,13 @@ input_system_err_t input_system_configuration_commit(void)
// The last configuration step is to configure the input buffer.
input_system_err_t error = input_buffer_configuration();
- if (error != INPUT_SYSTEM_ERR_NO_ERROR) {
+ if (error != INPUT_SYSTEM_ERR_NO_ERROR)
return error;
- }
// Translate the whole configuration into registers.
error = configuration_to_registers();
- if (error != INPUT_SYSTEM_ERR_NO_ERROR) {
+ if (error != INPUT_SYSTEM_ERR_NO_ERROR)
return error;
- }
// Translate the whole configuration into ctrl commands etc.
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
index b66560bca625..61dea386361a 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/irq.c
@@ -55,9 +55,8 @@ void irq_clear_all(
assert(ID < N_IRQ_ID);
assert(IRQ_N_CHANNEL[ID] <= HRT_DATA_WIDTH);
- if (IRQ_N_CHANNEL[ID] < HRT_DATA_WIDTH) {
+ if (IRQ_N_CHANNEL[ID] < HRT_DATA_WIDTH)
mask = ~((~(hrt_data)0) >> IRQ_N_CHANNEL[ID]);
- }
irq_reg_store(ID,
_HRT_IRQ_CONTROLLER_CLEAR_REG_IDX, mask);
@@ -115,9 +114,9 @@ void irq_enable_pulse(
{
unsigned int edge_out = 0x0;
- if (pulse) {
+ if (pulse)
edge_out = 0xffffffff;
- }
+
/* output is given as edge, not pulse */
irq_reg_store(ID,
_HRT_IRQ_CONTROLLER_EDGE_NOT_PULSE_REG_IDX, edge_out);
@@ -259,9 +258,9 @@ void virq_clear_all(void)
{
irq_ID_t irq_id;
- for (irq_id = (irq_ID_t)0; irq_id < N_IRQ_ID; irq_id++) {
+ for (irq_id = (irq_ID_t)0; irq_id < N_IRQ_ID; irq_id++)
irq_clear_all(irq_id);
- }
+
return;
}
@@ -301,9 +300,9 @@ void virq_clear_info(struct virq_info *irq_info)
assert(irq_info);
- for (ID = (irq_ID_t)0 ; ID < N_IRQ_ID; ID++) {
+ for (ID = (irq_ID_t)0 ; ID < N_IRQ_ID; ID++)
irq_info->irq_status_reg[ID] = 0;
- }
+
return;
}
@@ -324,20 +323,17 @@ enum hrt_isp_css_irq_status virq_get_channel_id(
break;
}
- if (idx == IRQ_N_CHANNEL[IRQ0_ID]) {
+ if (idx == IRQ_N_CHANNEL[IRQ0_ID])
return hrt_isp_css_irq_status_error;
- }
/* Check whether there are more bits set on device 0 */
- if (irq_status != (1U << idx)) {
+ if (irq_status != (1U << idx))
status = hrt_isp_css_irq_status_more_irqs;
- }
/* Check whether we have an IRQ on one of the nested devices */
for (ID = N_IRQ_ID - 1 ; ID > (irq_ID_t)0; ID--) {
- if (IRQ_NESTING_ID[ID] == (enum virq_id)idx) {
+ if (IRQ_NESTING_ID[ID] == (enum virq_id)idx)
break;
- }
}
/* If we have a nested IRQ, load that state, discard the device 0 state */
@@ -350,9 +346,8 @@ enum hrt_isp_css_irq_status virq_get_channel_id(
break;
}
- if (idx == IRQ_N_CHANNEL[ID]) {
+ if (idx == IRQ_N_CHANNEL[ID])
return hrt_isp_css_irq_status_error;
- }
/* Alternatively check whether there are more bits set on this device */
if (irq_status != (1U << idx)) {
@@ -408,9 +403,8 @@ static inline irq_ID_t virq_get_irq_id(
assert(channel_ID);
for (ID = (irq_ID_t)0 ; ID < N_IRQ_ID; ID++) {
- if (irq_ID < IRQ_N_ID_OFFSET[ID + 1]) {
+ if (irq_ID < IRQ_N_ID_OFFSET[ID + 1])
break;
- }
}
*channel_ID = (unsigned int)irq_ID - IRQ_N_ID_OFFSET[ID];
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
index 064e88a5e064..70d118fe1e70 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/mmu.c
@@ -32,7 +32,6 @@ void mmu_invalidate_cache_all(void)
{
mmu_ID_t mmu_id;
- for (mmu_id = (mmu_ID_t)0; mmu_id < N_MMU_ID; mmu_id++) {
+ for (mmu_id = (mmu_ID_t)0; mmu_id < N_MMU_ID; mmu_id++)
mmu_invalidate_cache(mmu_id);
- }
}
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
index 722b684fbc37..1c5c50406633 100644
--- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
+++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/host/vmem.c
@@ -168,9 +168,9 @@ static void store_vector(
//load_vector (&v[1][0], &to[ISP_NWAY]); /* Fetch the next vector, since it will be overwritten. */
hive_uedge *data = (hive_uedge *)v;
- for (i = 0; i < ISP_NWAY; i++) {
+ for (i = 0; i < ISP_NWAY; i++)
hive_sim_wide_pack(data, (hive_wide)&from[i], ISP_VEC_ELEMBITS, i);
- }
+
assert(ISP_BAMEM_BASE[ID] != (hrt_address) - 1);
#if !defined(HRT_MEMORY_ACCESS)
ia_css_device_store(ISP_BAMEM_BASE[ID] + (unsigned long)to, &v, size);
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
index 09599884bdae..08af8a848fbf 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/anr/anr_2/ia_css_anr2.host.c
@@ -22,9 +22,8 @@ ia_css_anr2_vmem_encode(
for (i = 0; i < ANR_PARAM_SIZE; i++) {
unsigned int j;
- for (j = 0; j < ISP_VEC_NELEMS; j++) {
+ for (j = 0; j < ISP_VEC_NELEMS; j++)
to->data[i][j] = from->data[i * ISP_VEC_NELEMS + j];
- }
}
}
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
index cd867937ee13..fcd7d7e2afe8 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/bnlm/ia_css_bnlm.host.c
@@ -125,14 +125,12 @@ ia_css_bnlm_vmem_encode(
bnlm_lut_encode(&to->div_lut, div_lut_nearests, div_lut_slopes,
BNLM_DIV_LUT_SIZE);
memset(to->div_lut_intercepts, 0, sizeof(to->div_lut_intercepts));
- for (i = 0; i < BNLM_DIV_LUT_SIZE; i++) {
+ for (i = 0; i < BNLM_DIV_LUT_SIZE; i++)
to->div_lut_intercepts[0][i] = div_lut_intercepts[i];
- }
memset(to->power_of_2, 0, sizeof(to->power_of_2));
- for (i = 0; i < (ISP_VEC_ELEMBITS - 1); i++) {
+ for (i = 0; i < (ISP_VEC_ELEMBITS - 1); i++)
to->power_of_2[0][i] = 1 << i;
- }
}
/* - Encodes BNLM public parameters into DMEM parameters */
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
index 38751b8e9e6a..177487b6b237 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c
@@ -52,13 +52,12 @@ static int ctc2_slope(int y1, int y0, int x1, int x0)
/*the slope must lie within the range
(-max_slope-1) >= (dydx) >= (max_slope)
*/
- if (slope <= -max_slope - 1) {
+ if (slope <= -max_slope - 1)
dydx = -max_slope - 1;
- } else if (slope >= max_slope) {
+ else if (slope >= max_slope)
dydx = max_slope;
- } else {
+ else
dydx = slope;
- }
return dydx;
}
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 8e4451fcc8e3..76d76ca4401a 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -140,17 +140,14 @@ ia_css_eed1_8_vmem_encode(
assert(tcinv_x[0] == 0);
assert(fcinv_x[0] == 0);
- for (j = 1; j < NUMBER_OF_CHGRINV_POINTS; j++) {
+ for (j = 1; j < NUMBER_OF_CHGRINV_POINTS; j++)
assert(chgrinv_x[j] > chgrinv_x[j - 1]);
- }
- for (j = 1; j < NUMBER_OF_TCINV_POINTS; j++) {
+ for (j = 1; j < NUMBER_OF_TCINV_POINTS; j++)
assert(tcinv_x[j] > tcinv_x[j - 1]);
- }
- for (j = 1; j < NUMBER_OF_FCINV_POINTS; j++) {
+ for (j = 1; j < NUMBER_OF_FCINV_POINTS; j++)
assert(fcinv_x[j] > fcinv_x[j - 1]);
- }
/* The implementation of the calculating 1/x is based on the availability
* of the OP_vec_shuffle16 operation.
@@ -260,9 +257,9 @@ ia_css_eed1_8_encode(
to->margin_neg_diff = (from->neg_margin1 - from->neg_margin0);
/* Encode DEWEnhance exp (e_dew_enh_asr) */
- for (i = 0; i < (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1); i++) {
+ for (i = 0; i < (IA_CSS_NUMBER_OF_DEW_ENHANCE_SEGMENTS - 1); i++)
min_exp = max(min_exp, from->dew_enhance_seg_exp[i]);
- }
+
to->e_dew_enh_asr = 13 - clamp(min_exp, 0, 13);
to->dedgew_max = from->dedgew_max;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
index 13678138c48c..823a1b0c0991 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c
@@ -240,9 +240,8 @@ ia_css_s3a_hmem_decode(
/* Calculate sum of histogram of R,
which should not be less than count_for_3a */
sum_r = 0;
- for (i = 0; i < HMEM_UNIT_SIZE; i++) {
+ for (i = 0; i < HMEM_UNIT_SIZE; i++)
sum_r += out_ptr[i].r;
- }
if (sum_r < count_for_3a) {
/* histogram is invalid */
return;
diff --git a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
index a1bea8bd1a39..f483e690a114 100644
--- a/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
+++ b/drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c
@@ -50,9 +50,8 @@ void ia_css_sdis_horicoef_vmem_encode(
assert(size % (IA_CSS_DVS_NUM_COEF_TYPES * ISP_VEC_NELEMS * sizeof(
short)) == 0);
- for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++) {
+ for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++)
fill_row(&private[type * stride], &public[type * width], width, padding);
- }
}
void ia_css_sdis_vertcoef_vmem_encode(
@@ -77,9 +76,8 @@ void ia_css_sdis_vertcoef_vmem_encode(
assert(size % (IA_CSS_DVS_NUM_COEF_TYPES * ISP_VEC_NELEMS * sizeof(
short)) == 0);
- for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++) {
+ for (type = 0; type < IA_CSS_DVS_NUM_COEF_TYPES; type++)
fill_row(&private[type * stride], &public[type * height], height, padding);
- }
}
void ia_css_sdis_horiproj_encode(
diff --git a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
index 315cce008d3c..78c0457b16b5 100644
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -672,9 +672,8 @@ ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
err = ia_css_isp_param_allocate_isp_parameters(
&binary->mem_params, &binary->css_params,
&info->mem_initializers);
- if (err) {
+ if (err)
return err;
- }
}
for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
if (out_info[i] && (out_info[i]->res.width != 0)) {
diff --git a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
index b411ca2f415e..58d99abe70aa 100644
--- a/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
+++ b/drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c
@@ -1123,9 +1123,8 @@ ia_css_debug_pipe_graph_dump_prologue(void)
void ia_css_debug_pipe_graph_dump_epilogue(void)
{
- if (strlen(ring_buffer) > 0) {
+ if (strlen(ring_buffer) > 0)
dtrace_dot(ring_buffer);
- }
if (pg_inst.stream_format != N_ATOMISP_INPUT_FORMAT) {
/* An input stream format has been set so assume we have
@@ -1778,9 +1777,8 @@ static void debug_dump_one_trace(enum TRACE_CORE_ID proc_id)
* When tid value is 111b, the data will be interpreted differently:
* tid val is ignored, major field contains 2 bits (msb) for format type
*/
- if (tid_val == FIELD_TID_SEL_FORMAT_PAT) {
+ if (tid_val == FIELD_TID_SEL_FORMAT_PAT)
dump_format = FIELD_FORMAT_UNPACK(trace_read_buf[j]);
- }
}
switch (dump_format) {
case TRACE_DUMP_FORMAT_POINT:
diff --git a/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
index e6c11d5f77b4..8e8433f5b07a 100644
--- a/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
+++ b/drivers/staging/media/atomisp/pci/runtime/isys/src/virtual_isys.c
@@ -295,9 +295,8 @@ static bool create_input_system_channel(
if (!rc)
return false;
- if (!acquire_sid(me->stream2mmio_id, &me->stream2mmio_sid_id)) {
+ if (!acquire_sid(me->stream2mmio_id, &me->stream2mmio_sid_id))
return false;
- }
if (!acquire_ib_buffer(
metadata ? cfg->metadata.bits_per_pixel :
diff --git a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
index cb8d652227a7..fb79ac07e270 100644
--- a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
+++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c
@@ -575,9 +575,8 @@ static int pipeline_stage_create(
binary = stage_desc->binary;
firmware = stage_desc->firmware;
vf_frame = stage_desc->vf_frame;
- for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++) {
+ for (i = 0; i < IA_CSS_BINARY_MAX_OUTPUT_PORTS; i++)
out_frame[i] = stage_desc->out_frame[i];
- }
stage = kvzalloc(sizeof(*stage), GFP_KERNEL);
if (!stage) {
diff --git a/drivers/staging/media/atomisp/pci/sh_css_params.c b/drivers/staging/media/atomisp/pci/sh_css_params.c
index 11d62313c908..992acbf758cb 100644
--- a/drivers/staging/media/atomisp/pci/sh_css_params.c
+++ b/drivers/staging/media/atomisp/pci/sh_css_params.c
@@ -1928,9 +1928,8 @@ sh_css_set_per_frame_isp_config_on_pipe(
params = stream->per_frame_isp_params_configs;
/* update new ISP params object with the new config */
- if (!sh_css_init_isp_params_from_global(stream, params, false, pipe)) {
+ if (!sh_css_init_isp_params_from_global(stream, params, false, pipe))
err1 = -EINVAL;
- }
err2 = sh_css_init_isp_params_from_config(stream->pipes[0], params, config, pipe);
@@ -2004,9 +2003,8 @@ sh_css_init_isp_params_from_config(struct ia_css_pipe *pipe,
* user. */
/* we do not exit from this point immediately to allow internal
* firmware feature testing. */
- if (is_dp_10bpp) {
+ if (is_dp_10bpp)
err = -EINVAL;
- }
} else {
err = -EINVAL;
goto exit;
@@ -3034,9 +3032,8 @@ process_kernel_parameters(unsigned int pipe_id,
ia_css_ob_configure(¶ms->stream_configs.ob,
isp_pipe_version, raw_bit_depth);
}
- if (params->config_changed[IA_CSS_S3A_ID]) {
+ if (params->config_changed[IA_CSS_S3A_ID])
ia_css_s3a_configure(raw_bit_depth);
- }
/* Copy stage uds parameters to config, since they can differ per stage.
*/
params->crop_config.crop_pos = params->uds[stage->stage_num].crop_pos;
@@ -3899,9 +3896,8 @@ sh_css_invalidate_params(struct ia_css_stream *stream)
params->isp_params_changed = true;
for (i = 0; i < IA_CSS_PIPE_ID_NUM; i++) {
for (j = 0; j < SH_CSS_MAX_STAGES; j++) {
- for (mem = 0; mem < N_IA_CSS_MEMORIES; mem++) {
+ for (mem = 0; mem < N_IA_CSS_MEMORIES; mem++)
params->isp_mem_params_changed[i][j][mem] = true;
- }
}
}
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread