staging: media: atomisp: Fix braces on incorrect lines

Fix checkpatch.pl errors:

ERROR: that open brace { should be on the previous line

Signed-off-by: Matt Wardle <matt@mattwardle.net>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>

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 4c85b5a622244c2844e716e32b84b02f9562d899..cf6c29155758806f92e44b0571f3d5a6f5b4d5bb 100644 (file)
--- 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
@@ -273,8 +273,7 @@ int store_dvs_6axis_config(const struct ia_css_dvs_6axis_config *dvs_6axis_confi
                                               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 80fd64a8eb98354d3b7d3077299aa21033586629..fb0e2a88cadb32a938b4292e2a7c318ec3e90c95 100644 (file)
--- 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
@@ -23,8 +23,7 @@ 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)
-       {
+       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 da58b61b091f2c12cd210305a62d5a9f33e147fa..67860a5e44416b41ed18b6359f61fc5435097719 100644 (file)
--- 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
@@ -176,13 +176,11 @@ int ia_css_get_dvs2_statistics(struct ia_css_dvs2_statistics *host_stats,
        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 f8870f7e790d2e4ab4dfc482b7e3fffd96ebb951..152faab2b169e74783cc634935c517361080dd73 100644 (file)
--- 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
@@ -64,8 +64,7 @@ int sh_css_vf_downscale_log2(const struct ia_css_frame_info *out_info,
        * 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;
        }

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 c7962549e999d80944d1b585a3a70b41b8d915ee..39b37b557affe9bf39a3a597ae8e11dc4af522d2 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -477,8 +477,7 @@ int 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;
@@ -502,8 +501,7 @@ int 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);
@@ -664,8 +662,7 @@ int 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,
@@ -673,15 +670,13 @@ int ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
                if (err)
                        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);
        }
@@ -712,8 +707,7 @@ int 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;
 
@@ -741,15 +735,13 @@ int 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;
@@ -768,8 +760,7 @@ int 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) {
@@ -787,8 +778,7 @@ int 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;
@@ -820,23 +810,20 @@ int 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;
@@ -846,8 +833,7 @@ int 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;
@@ -857,18 +843,15 @@ int 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);
@@ -881,21 +864,18 @@ int 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 354e5405fd6081f16dfec2fe2419e47aad9c6d97..1d20eb6507570a000734b423dbf8b4ce8e3a25f0 100644 (file)
--- 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
@@ -101,8 +101,7 @@ int ia_css_isp_param_allocate_isp_parameters(struct ia_css_isp_param_host_segmen
        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;
 
@@ -176,8 +175,7 @@ int ia_css_isp_param_copy_isp_mem_if_to_ddr(struct ia_css_isp_param_css_segments
 {
        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 6cda5925fa45ed6546d791e7aafdcd15485c694c..f40b6912c14bea1c877b44ff450aebe58c6aec10 100644 (file)
--- 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;
@@ -7856,8 +7855,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) {