staging: media: atomisp: Fix function indentation and braces

Fix parameter indentation for functions and move opening braces onto new
line. Fix checkpatch.pl errors:

ERROR: open brace '{' following function definitions go on the next 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 e9d6dd0bbfe28a1ed0c1a70f205e281834628d8b..4c85b5a622244c2844e716e32b84b02f9562d899 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
@@ -258,12 +258,11 @@ convert_allocate_dvs_6axis_config(
        return me;
 }
 
-int
-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) {
+int 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)
+{
        struct ia_css_host_data *me;
 
        assert(dvs_6axis_config);

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 a00f8d049a3369457c80586cd899ca3caaebd77a..80fd64a8eb98354d3b7d3077299aa21033586629 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
@@ -21,8 +21,8 @@ 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) {
+static enum sh_stream_format css2isp_stream_format(enum atomisp_input_format from)
+{
        switch (from)
        {
        case ATOMISP_INPUT_FORMAT_YUV420_8_LEGACY:

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 4a38d678f334809fcde4989fc9d4906a8af61b9e..da58b61b091f2c12cd210305a62d5a9f33e147fa 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
@@ -164,10 +164,9 @@ void ia_css_sdis2_clear_coefficients(
        dvs2_coefs->ver_coefs.even_imag = NULL;
 }
 
-int
-ia_css_get_dvs2_statistics(
-    struct ia_css_dvs2_statistics          *host_stats,
-    const struct ia_css_isp_dvs_statistics *isp_stats) {
+int ia_css_get_dvs2_statistics(struct ia_css_dvs2_statistics *host_stats,
+                              const struct ia_css_isp_dvs_statistics *isp_stats)
+{
        struct ia_css_isp_dvs_statistics_map *map;
        int ret = 0;
 

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 3c675063c4a7e38423071f0db9eb886c61567ae5..f8870f7e790d2e4ab4dfc482b7e3fffd96ebb951 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
@@ -45,11 +45,10 @@ int ia_css_vf_config(struct sh_css_isp_vf_isp_config      *to,
  * to the requested viewfinder resolution on the upper side. The output cannot
  * be smaller than the requested viewfinder resolution.
  */
-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) {
+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 ds_log2 = 0;
        unsigned int out_width;
 
@@ -80,13 +79,12 @@ sh_css_vf_downscale_log2(
        return 0;
 }
 
-static int
-configure_kernel(
-    const struct ia_css_binary_info *info,
-    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) {
+static int configure_kernel(const struct ia_css_binary_info *info,
+                           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)
+{
        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 60ae7bf5512b62c4af5ea7e98b9efe5a87646ca8..c7962549e999d80944d1b585a3a70b41b8d915ee 100644 (file)
--- a/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
+++ b/drivers/staging/media/atomisp/pci/runtime/binary/src/binary.c
@@ -347,10 +347,10 @@ ia_css_binary_dvs_stat_grid_info(
        return;
 }
 
-int
-ia_css_binary_3a_grid_info(const struct ia_css_binary *binary,
-                          struct ia_css_grid_info *info,
-                          struct ia_css_pipe *pipe) {
+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_3a_grid_info *s3a_info;
        int err = 0;
 
@@ -439,9 +439,9 @@ supports_bds_factor(u32 supported_factors,
        return ((supported_factors & PACK_BDS_FACTOR(bds_factor)) != 0);
 }
 
-static int
-binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
-                bool *binary_found) {
+static int binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
+                           bool *binary_found)
+{
        const unsigned char *blob = sh_css_blob_info[i].blob;
        unsigned int size = sh_css_blob_info[i].header.blob.size;
 
@@ -464,8 +464,8 @@ binary_init_info(struct ia_css_binary_xinfo *info, unsigned int i,
 /* When binaries are put at the beginning, they will only
  * be selected if no other primary matches.
  */
-int
-ia_css_binary_init_infos(void) {
+int 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;
 
@@ -497,8 +497,8 @@ ia_css_binary_init_infos(void) {
        return 0;
 }
 
-int
-ia_css_binary_uninit(void) {
+int ia_css_binary_uninit(void)
+{
        unsigned int i;
        struct ia_css_binary_xinfo *b;
 
@@ -625,19 +625,19 @@ binary_in_frame_padded_width(int in_frame_width,
        return rval;
 }
 
-int
-ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
-                       bool online,
-                       bool two_ppc,
-                       enum atomisp_input_format stream_format,
-                       const struct ia_css_frame_info *in_info, /* can be NULL */
-                       const struct ia_css_frame_info *bds_out_info, /* can be NULL */
-                       const struct ia_css_frame_info *out_info[], /* can be NULL */
-                       const struct ia_css_frame_info *vf_info, /* can be NULL */
-                       struct ia_css_binary *binary,
-                       struct ia_css_resolution *dvs_env,
-                       int stream_config_left_padding,
-                       bool accelerator) {
+int ia_css_binary_fill_info(const struct ia_css_binary_xinfo *xinfo,
+                           bool online,
+                           bool two_ppc,
+                           enum atomisp_input_format stream_format,
+                           const struct ia_css_frame_info *in_info, /* can be NULL */
+                           const struct ia_css_frame_info *bds_out_info, /* can be NULL */
+                           const struct ia_css_frame_info *out_info[], /* can be NULL */
+                           const struct ia_css_frame_info *vf_info, /* can be NULL */
+                           struct ia_css_binary *binary,
+                           struct ia_css_resolution *dvs_env,
+                           int stream_config_left_padding,
+                           bool accelerator)
+{
        const struct ia_css_binary_info *info = &xinfo->sp;
        unsigned int dvs_env_width = 0,
        dvs_env_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 251dd75a761356f3da712072ba884ed951e8f45a..354e5405fd6081f16dfec2fe2419e47aad9c6d97 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
@@ -93,11 +93,10 @@ ia_css_init_memory_interface(
        }
 }
 
-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) {
+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)
+{
        int err = 0;
        unsigned int mem, pclass;
 
@@ -171,11 +170,10 @@ ia_css_isp_param_load_fw_params(
        }
 }
 
-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) {
+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)
+{
        unsigned int mem;
 
        for (mem = 0; mem < N_IA_CSS_ISP_MEMORIES; mem++)