From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F1E5C433B4 for ; Tue, 20 Apr 2021 13:02:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E83C5613C8 for ; Tue, 20 Apr 2021 13:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232235AbhDTNCp (ORCPT ); Tue, 20 Apr 2021 09:02:45 -0400 Received: from lb2-smtp-cloud7.xs4all.net ([194.109.24.28]:42467 "EHLO lb2-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232229AbhDTNCo (ORCPT ); Tue, 20 Apr 2021 09:02:44 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud7.xs4all.net with ESMTPA id Yq12lXxsJ8K3KYq16lzhxv; Tue, 20 Apr 2021 15:02:12 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1618923732; bh=MzkEna9j2UFKhvH7TTlA4EvSMvi/juMgtc9pF3WQhZQ=; h=Subject:To:From:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=LdIIWr2F+TUjbXtFARIl7R0Y9WZHAAuSBPChY2K92TJnegeC3gEEPLhoexNtCPWw8 Tw0X5s9CdLjckCGaSLeoCUQu/ybAEro6qWYj4nNdcmE7LHdfoAyKM0qN708WJTrI/e yHGGg9uLVGcvQkw9CnOVGwrC9UwgGfNzxQlpCPsU9PcAjryic0sN9SnrnpQdObZfdE ivPrl2x9TFLatYLG8lUY4fKbYlDZTltZ6LBfMW3//6j9qhyA6tzYSyOCZNkScuvROA 4QLgtRwLzZCuWJy7EwX/S2A3rBHuW35kV/tbkUgoBBPVjw9tnS6SKESgDq+E4FwRAK 0XCn+Bi0JHS1Q== Subject: Re: [PATCH 7/8] staging: media: atomisp: Fix line split style issues To: Martiros Shakhzadyan , Mauro Carvalho Chehab Cc: Sakari Ailus , linux-media@vger.kernel.org References: <20210419192602.498815-1-vrzh@vrzh.net> <20210419192602.498815-8-vrzh@vrzh.net> From: Hans Verkuil Message-ID: <6c29dbac-2bbc-9c88-ec0b-b9a0b9c87f11@xs4all.nl> Date: Tue, 20 Apr 2021 15:02:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <20210419192602.498815-8-vrzh@vrzh.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfGEnnKdqXAjTjkgbG/kPZ5OeiY7K6kXGqCjKoGGShmWvzRErMfuV+59rbcXtBU17qXHxVcg1F0ApIe33/AG0rBMWnzDyQvcKEqKSrH3nq+9EVEsC1ojj wvKR8oxpshI9gYd+RUhxjdGAIWvF4n2WYHs+ixNlqIlcq1I0dIOr2IenlV+Grclxy4CB8A/871YZdt3YY8caT5cOKyuAV7bd/h/T84zhfJujY+89M1KQWK4A 9t3mxiDV2yv3kfcxOclL5VhzBUAySH9GGtq3ypaikC7YDdLuG2FR4inXuAaQ7ya9 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 19/04/2021 21:26, Martiros Shakhzadyan wrote: > Fix coding style issues > > Signed-off-by: Martiros Shakhzadyan > --- > drivers/staging/media/atomisp/pci/sh_css.c | 76 ++++++++++------------ > 1 file changed, 34 insertions(+), 42 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c > index 3d58b9b3d50d..ea096e6f90e5 100644 > --- a/drivers/staging/media/atomisp/pci/sh_css.c > +++ b/drivers/staging/media/atomisp/pci/sh_css.c > @@ -308,8 +308,7 @@ sh_css_pipeline_add_acc_stage(struct ia_css_pipeline *pipeline, > const void *acc_fw); > > static int > -alloc_continuous_frames( > - struct ia_css_pipe *pipe, bool init_time); > +alloc_continuous_frames(struct ia_css_pipe *pipe, bool init_time); > > static void > pipe_global_init(void); > @@ -2622,8 +2621,7 @@ static int load_copy_binary( > } > > static int > -alloc_continuous_frames( > - struct ia_css_pipe *pipe, bool init_time) > +alloc_continuous_frames(struct ia_css_pipe *pipe, bool init_time) > { > int err = 0; > struct ia_css_frame_info ref_info; > @@ -4080,11 +4078,11 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, > } > ddr_buffer.kernel_ptr = HOST_ADDRESS(buffer->data.metadata); > ddr_buffer.payload.metadata = *buffer->data.metadata; > - } else if ((buf_type == IA_CSS_BUFFER_TYPE_INPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME)) { > + } else if ((buf_type == IA_CSS_BUFFER_TYPE_INPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME)) { This should be aligned with the open parenthesis... > if (!buffer->data.frame) { > IA_CSS_LEAVE_ERR(-EINVAL); > return -EINVAL; > @@ -4124,9 +4122,9 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, > hmm_store(h_vbuf->vptr, > (void *)(&ddr_buffer), > sizeof(struct sh_css_hmm_buffer)); > - if ((buf_type == IA_CSS_BUFFER_TYPE_3A_STATISTICS) > - || (buf_type == IA_CSS_BUFFER_TYPE_DIS_STATISTICS) > - || (buf_type == IA_CSS_BUFFER_TYPE_LACE_STATISTICS)) { > + if ((buf_type == IA_CSS_BUFFER_TYPE_3A_STATISTICS) || > + (buf_type == IA_CSS_BUFFER_TYPE_DIS_STATISTICS) || > + (buf_type == IA_CSS_BUFFER_TYPE_LACE_STATISTICS)) { ...like this! > if (!pipeline) { > ia_css_rmgr_rel_vbuf(hmm_buffer_pool, &h_vbuf); > IA_CSS_LOG("pipeline is empty!"); > @@ -4144,12 +4142,12 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, > (uint32_t)h_vbuf->vptr); > } > } > - } else if ((buf_type == IA_CSS_BUFFER_TYPE_INPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME) > - || (buf_type == IA_CSS_BUFFER_TYPE_METADATA)) { > + } else if ((buf_type == IA_CSS_BUFFER_TYPE_INPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_VF_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME) || > + (buf_type == IA_CSS_BUFFER_TYPE_METADATA)) { Ditto. > return_err = ia_css_bufq_enqueue_buffer(thread_id, > queue_id, > (uint32_t)h_vbuf->vptr); > @@ -6197,8 +6195,7 @@ allocate_delay_frames(struct ia_css_pipe *pipe) > return 0; > } > > -static int load_advanced_binaries( > - struct ia_css_pipe *pipe) > +static int load_advanced_binaries(struct ia_css_pipe *pipe) > { > struct ia_css_frame_info pre_in_info, gdc_in_info, > post_in_info, post_out_info, > @@ -6315,8 +6312,7 @@ static int load_advanced_binaries( > return err; > } > > -static int load_bayer_isp_binaries( > - struct ia_css_pipe *pipe) > +static int load_bayer_isp_binaries(struct ia_css_pipe *pipe) > { > struct ia_css_frame_info pre_isp_in_info, *pipe_out_info; > int err = 0; > @@ -6345,8 +6341,7 @@ static int load_bayer_isp_binaries( > return err; > } > > -static int load_low_light_binaries( > - struct ia_css_pipe *pipe) > +static int load_low_light_binaries(struct ia_css_pipe *pipe) > { > struct ia_css_frame_info pre_in_info, anr_in_info, > post_in_info, post_out_info, > @@ -6484,8 +6479,7 @@ static bool copy_on_sp(struct ia_css_pipe *pipe) > return rval; > } > > -static int load_capture_binaries( > - struct ia_css_pipe *pipe) > +static int load_capture_binaries(struct ia_css_pipe *pipe) > { > int err = 0; > bool must_be_raw; > @@ -6560,7 +6554,8 @@ unload_capture_binaries(struct ia_css_pipe *pipe) > > IA_CSS_ENTER_PRIVATE("pipe = %p", pipe); > > - if ((!pipe) || ((pipe->mode != IA_CSS_PIPE_ID_CAPTURE) && (pipe->mode != IA_CSS_PIPE_ID_COPY))) { > + if ((!pipe) || ((pipe->mode != IA_CSS_PIPE_ID_CAPTURE) && > + (pipe->mode != IA_CSS_PIPE_ID_COPY))) { > IA_CSS_LEAVE_ERR_PRIVATE(-EINVAL); > return -EINVAL; > } > @@ -6637,10 +6632,10 @@ need_yuv_scaler_stage(const struct ia_css_pipe *pipe) > /* which has some hard-coded knowledge which prevents reuse of the function. */ > /* Later, merge this with ia_css_pipe_create_cas_scaler_desc */ > static int ia_css_pipe_create_cas_scaler_desc_single_output( > - struct ia_css_frame_info *cas_scaler_in_info, > - struct ia_css_frame_info *cas_scaler_out_info, > - struct ia_css_frame_info *cas_scaler_vf_info, > - struct ia_css_cas_binary_descr *descr) > + struct ia_css_frame_info *cas_scaler_in_info, > + struct ia_css_frame_info *cas_scaler_out_info, > + struct ia_css_frame_info *cas_scaler_vf_info, > + struct ia_css_cas_binary_descr *descr) > { > unsigned int i; > unsigned int hor_ds_factor = 0, ver_ds_factor = 0; > @@ -6757,9 +6752,8 @@ static int ia_css_pipe_create_cas_scaler_desc_single_output( > } > > /* FIXME: merge most of this and single output version */ > -static int ia_css_pipe_create_cas_scaler_desc( > - struct ia_css_pipe *pipe, > - struct ia_css_cas_binary_descr *descr) > +static int ia_css_pipe_create_cas_scaler_desc(struct ia_css_pipe *pipe, > + struct ia_css_cas_binary_descr *descr) Perhaps add a newline after 'static int' to keep the lines a bit shorter. > { > struct ia_css_frame_info in_info = IA_CSS_BINARY_DEFAULT_FRAME_INFO; > struct ia_css_frame_info *out_info[IA_CSS_PIPE_MAX_OUTPUT_STAGE]; > @@ -7926,7 +7920,9 @@ create_host_regular_capture_pipeline(struct ia_css_pipe *pipe) > * should not be considered as a clean solution. Proper > * investigation should be done to come up with the clean solution. > * */ > - if (mode != IA_CSS_CAPTURE_MODE_RAW && mode != IA_CSS_CAPTURE_MODE_BAYER && current_stage && vf_frame) { > + if (mode != IA_CSS_CAPTURE_MODE_RAW && > + mode != IA_CSS_CAPTURE_MODE_BAYER && > + current_stage && vf_frame) { > in_frame = current_stage->args.out_vf_frame; > err = add_vf_pp_stage(pipe, in_frame, vf_frame, vf_pp_binary, > ¤t_stage); > @@ -7964,8 +7960,7 @@ create_host_capture_pipeline(struct ia_css_pipe *pipe) > return err; > } > > -static int capture_start( > - struct ia_css_pipe *pipe) > +static int capture_start(struct ia_css_pipe *pipe) > { > struct ia_css_pipeline *me; > > @@ -8366,11 +8361,8 @@ int ia_css_stream_capture_frame(struct ia_css_stream *stream, > * @brief Configure the continuous capture. > * Refer to "sh_css_internal.h" for details. > */ > -int ia_css_stream_capture( > - struct ia_css_stream *stream, > - int num_captures, > - unsigned int skip, > - int offset) > +int ia_css_stream_capture(struct ia_css_stream *stream, int num_captures, > + unsigned int skip, int offset) > { > struct sh_css_tag_descr tag_descr; > unsigned int encoded_tag_descr; > Regards, Hans