media: staging: media: atomisp: pci: reposition braces as per coding style
Subsystems (4)
This is an automatic generated email to let you know that the following patch were queued:
Subject: media: staging: media: atomisp: pci: reposition braces as per coding style Author: Deepak R Varma <[email protected]> Date: Fri Apr 30 17:40:12 2021 +0200
Misplaced braces makes it difficult to follow the code easily. This also goes against the code style guidelines. This resolved following checkpatch complaints:
ERROR: open brace '{' following function definitions go on the next line
ERROR: that open brace { should be on the previous line
[mchehab: dropped a hunk with a merge conflict]
Cc [email protected], [email protected], [email protected], [email protected] # X-LSpam-Score: -7.3 (-------)
Signed-off-by Deepak R Varma <[email protected]>
Signed-off-by Mauro Carvalho Chehab <[email protected]>
drivers/staging/media/atomisp/pci/sh_css_mipi.c | 69 ++++----- drivers/staging/media/atomisp/pci/sh_css_params.c | 171 +++++++++------------ drivers/staging/media/atomisp/pci/sh_css_sp.c | 108 ++++++------- drivers/staging/media/atomisp/pci/sh_css_version.c | 3 +- 4 files changed, 155 insertions(+), 196 deletions(-)
---
drivers/staging/media/atomisp/pci/sh_css_mipi.c +29 -40
@@ -91,7 +91,8 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,const enum atomisp_input_format format, const bool hasSOLandEOL, const unsigned int embedded_data_size_words, - unsigned int *size_mem_words) { + unsigned int *size_mem_words) +{ int err = 0;unsigned int bits_per_pixel =0 ;
@@ -118,8 +119,7 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,IA_CSS_ENTER ("padded_width=%d, height=%d, format=%d, hasSOLandEOL=%d, embedded_data_size_words=%d\n" , width_padded, height, format, hasSOLandEOL, embedded_data_size_words); -switch (format) - { +switch (format) {case ATOMISP_INPUT_FORMAT_RAW_6 :/* 4p, 3B, 24bits */ bits_per_pixel =6 ;break ;
@@ -178,12 +178,10 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,/* Even lines for YUV420 formats are double in bits_per_pixel. */ if (format ==ATOMISP_INPUT_FORMAT_YUV420_8 || format ==ATOMISP_INPUT_FORMAT_YUV420_10 - || format ==ATOMISP_INPUT_FORMAT_YUV420_16 ) - { + || format ==ATOMISP_INPUT_FORMAT_YUV420_16 ) { even_line_bytes = (width_padded *2 * bits_per_pixel +7 ) >>3 ;/* ceil ( bits per line / 8) */ - }else - { + }else { even_line_bytes = odd_line_bytes; }
@@ -236,7 +234,8 @@ ia_css_mipi_frame_calculate_size(const unsigned int width,#if !defined(ISP2401 )int ia_css_mipi_frame_enable_check_on_size (const enum mipi_port_id port, -const unsigned int size_mem_words) { +const unsigned int size_mem_words) +{u32 idx;int err = -EBUSY ;
@@ -246,11 +245,9 @@ ia_css_mipi_frame_enable_check_on_size(const enum mipi_port_id port,for (idx =0 ; idx <IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT && my_css.mipi_sizes_for_check[port][idx] !=0 ; - idx++)/* do nothing */ - { + idx++) {/* do nothing */ } -if (idx <IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT ) - { +if (idx <IA_CSS_MIPI_SIZE_CHECK_MAX_NOF_ENTRIES_PER_PORT ) { my_css.mipi_sizes_for_check[port][idx] = size_mem_words; err =0 ; }
@@ -271,7 +268,8 @@ mipi_init(void)int calculate_mipi_buff_size (struct ia_css_stream_config *stream_cfg, -unsigned int *size_mem_words) { +unsigned int *size_mem_words) +{#if !defined(ISP2401 )int err = -EINVAL ; (void )stream_cfg;
@@ -346,12 +344,10 @@ calculate_mipi_buff_size(/* Even lines for YUV420 formats are double in bits_per_pixel. */ if (format ==ATOMISP_INPUT_FORMAT_YUV420_8 - || format ==ATOMISP_INPUT_FORMAT_YUV420_10 ) - { + || format ==ATOMISP_INPUT_FORMAT_YUV420_10 ) { even_line_bytes = (width_padded *2 * bits_per_pixel +7 ) >>3 ;/* ceil ( bits per line / 8) */ - }else - { + }else { even_line_bytes = odd_line_bytes; }
@@ -393,7 +389,8 @@ static bool buffers_needed(struct ia_css_pipe *pipe)int allocate_mipi_frames (struct ia_css_pipe *pipe, -struct ia_css_stream_info *info) { +struct ia_css_stream_info *info) +{int err = -EINVAL ;unsigned int port;
@@ -402,8 +399,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,assert (pipe);assert (pipe->stream); -if ((!pipe) || (!pipe->stream)) - { +if ((!pipe) || (!pipe->stream)) {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE ,"allocate_mipi_frames(%p) exit: pipe or stream is null.\n" , pipe);
@@ -411,8 +407,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, }#ifdef ISP2401 -if (pipe->stream->config.online) - { +if (pipe->stream->config.online) {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE ,"allocate_mipi_frames(%p) exit: no buffers needed for 2401 pipe mode.\n" , pipe);
@@ -449,8 +444,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,#endif #if !defined(ISP2401 ) -if (ref_count_mipi_allocation[port] !=0 ) - { +if (ref_count_mipi_allocation[port] !=0 ) {ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE ,"allocate_mipi_frames(%p) exit: already allocated for this port (port=%d).\n" , pipe, port);
@@ -462,8 +456,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe,* TODO AM: Once that is changed (removed) this code should be removed as well. * In that case only 2400 related code should remain. */ -if (ref_count_mipi_allocation[port] !=0 ) - { +if (ref_count_mipi_allocation[port] !=0 ) { ref_count_mipi_allocation[port]++; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE, "allocate_mipi_frames(%p) leave: nothing to do, already allocated for this port (port=%d).\n",
@@ -481,8 +474,7 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, {/* limit the scope of i,j */ unsigned int i, j; -for (i =0 ; i < my_css.num_mipi_frames[port]; i++) - { +for (i =0 ; i < my_css.num_mipi_frames[port]; i++) {/* free previous frame */ if (my_css.mipi_frames[port][i]) {ia_css_frame_free (my_css.mipi_frames[port][i]);
@@ -535,7 +527,8 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, }int -free_mipi_frames (struct ia_css_pipe *pipe) { +free_mipi_frames (struct ia_css_pipe *pipe) +{int err = -EINVAL ;unsigned int port;
@@ -543,8 +536,7 @@ free_mipi_frames(struct ia_css_pipe *pipe) { "free_mipi_frames(%p) enter:\n", pipe);/* assert(pipe != NULL); TEMP: TODO: Should be assert only. */ -if (pipe) - { +if (pipe) {assert (pipe->stream);if ((!pipe) || (!pipe->stream)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,
@@ -620,8 +612,7 @@ free_mipi_frames(struct ia_css_pipe *pipe) { }#endif } - }else /* pipe ==NULL */ - { + }else {/* pipe ==NULL */ /* AM TEMP: free-ing all mipi buffers just like a legacy code. */ for (port =CSI_PORT0_ID ; port <N_CSI_PORTS ; port++) {unsigned int i;
@@ -645,7 +636,8 @@ free_mipi_frames(struct ia_css_pipe *pipe) { }int -send_mipi_frames (struct ia_css_pipe *pipe) { +send_mipi_frames (struct ia_css_pipe *pipe) +{int err = -EINVAL ;unsigned int i;#ifndef ISP2401
@@ -658,8 +650,7 @@ send_mipi_frames(struct ia_css_pipe *pipe) {assert (pipe);assert (pipe->stream); -if (!pipe || !pipe->stream) - { +if (!pipe || !pipe->stream) {IA_CSS_ERROR ("pipe or stream is null" );return -EINVAL ; }
@@ -686,8 +677,7 @@ send_mipi_frames(struct ia_css_pipe *pipe) { }/* Hand-over the SP-internal mipi buffers */ -for (i =0 ; i < my_css.num_mipi_frames[port]; i++) - { +for (i =0 ; i < my_css.num_mipi_frames[port]; i++) {/* Need to include the ofset for port. */ sh_css_update_host2sp_mipi_frame (port *NUM_MIPI_FRAMES_PER_STREAM + i, my_css.mipi_frames[port][i]);
@@ -700,8 +690,7 @@ send_mipi_frames(struct ia_css_pipe *pipe) {* Send an event to inform the SP * that all MIPI frames are passed. **********************************/ -if (!sh_css_sp_is_running ()) - { +if (!sh_css_sp_is_running ()) {/* SP is not running. The queues are not valid */ IA_CSS_ERROR ("sp is not running" );return err;
drivers/staging/media/atomisp/pci/sh_css_params.c +76 -95
494 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_sp.c +48 -60
302 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_version.c +2 -1
@@ -21,7 +21,8 @@#include "sh_css_firmware.h" int -ia_css_get_version (char *version,int max_size) { +ia_css_get_version (char *version,int max_size) +{char *css_version;if (!IS_ISP2401 )