staging: media: atomisp: fix block comment style
Subsystems (4)
PATCH v2 1/1 staging: media: atomisp: fix block comment style
Fixed all block comment style warnings by checkpatch.pl.
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 94 ++++++++++++------- 1 file changed, 59 insertions(+), 35 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +59 -35
@@ -99,11 +99,11 @@ static unsigned short atomisp_get_sensor_fps(struct atomisp_sub_device *asd)/* * DFS progress is shown as follows: * 1. Target frequency is calculated according to FPS/Resolution/ISP running -* mode. +* mode. * 2. Ratio is calculated using formula: 2 * HPLL / target frequency - 1 -* with proper rounding. +* with proper rounding. * 3. Set ratio to ISPFREQ40, 1 to FREQVALID and ISPFREQGUAR40 -* to 200MHz in ISPSSPM1. +* to 200MHz in ISPSSPM1. * 4. Wait for FREQVALID to be cleared by P-Unit. * 5. Wait for field ISPFREQSTAT40 in ISPSSPM1 turn to ratio set in 3. */
@@ -808,7 +808,8 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error, &asd->params.css_param);if (asd->params.css_param.update_flag.dz_config) asd->params.config.dz_config = &asd->params.css_param.dz_config; -/* New global dvs 6axis config should be blocked +/* +* New global dvs 6axis config should be blocked * here if there's a buffer with per-frame parameters * pending in CSS frame buffer queue. * This is to aviod zooming vibration since global
@@ -821,7 +822,8 @@ void atomisp_buf_done(struct atomisp_sub_device *asd, int error, asd->params.dvs_6axis); else asd->params.css_update_params_needed = false; -/* The update flag should not be cleaned here +/* +* The update flag should not be cleaned here * since it is still going to be used to make up * following per-frame parameters. * This will introduce more copy work since each
@@ -963,10 +965,10 @@ irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr)* The standard CSS2.0 API tells the following calling sequence of * dequeue ready buffers: * while (ia_css_dequeue_psys_event(...)) { -* switch (event.type) { -* ... -* ia_css_pipe_dequeue_buffer() -* } +* switch (event.type) { +* ... +* ia_css_pipe_dequeue_buffer() +* } * } * That is, dequeue event and buffer are one after another. *
@@ -1380,8 +1382,11 @@ static void atomisp_update_grid_info(struct atomisp_sub_device *asd,if (atomisp_css_get_grid_info (asd, pipe_id))return ; -/* We must free all buffers because they no longer match -the grid size. */ +/* +* We must free all buffers because they no longer match +* the grid size. +*/ +atomisp_css_free_stat_buffers (asd); err =atomisp_alloc_css_stat_bufs (asd,ATOMISP_INPUT_STREAM_GENERAL );
@@ -1393,8 +1398,10 @@ static void atomisp_update_grid_info(struct atomisp_sub_device *asd,if (atomisp_alloc_3a_output_buf (asd)) {/* Failure for 3A buffers does not influence DIS buffers */ if (asd->params.s3a_output_bytes !=0 ) { -/* For SOC sensor happens s3a_output_bytes == 0, -* using if condition to exclude false error log */ +/* +* For SOC sensor happens s3a_output_bytes == 0, +* using if condition to exclude false error log +*/ dev_err (isp->dev,"Failed to allocate memory for 3A statistics\n" ); } goto err;
@@ -1686,9 +1693,11 @@ int atomisp_3a_stat(struct atomisp_sub_device *asd, int flag,return -EINVAL ;if (atomisp_compare_grid (asd, &config->grid_info) !=0 ) { -/* If the grid info in the argument differs from the current -grid info, we tell the caller to reset the grid size and -try again. */ +/* +* If the grid info in the argument differs from the current +* grid info, we tell the caller to reset the grid size and +* try again. +*/ return -EAGAIN ; }
@@ -1774,7 +1783,8 @@ int atomisp_calculate_real_zoom_region(struct atomisp_sub_device *asd,return 0 ; } -/* FIXME: +/* +* FIXME: * This is not the correct implementation with Google's definition, due * to firmware limitation. * map real crop region base on above calculating base max crop region.
@@ -2462,9 +2472,11 @@ int atomisp_css_cp_dvs2_coefs(struct atomisp_sub_device *asd,if (sizeof (*cur) !=sizeof (coefs->grid) ||memcmp (&coefs->grid, cur,sizeof (coefs->grid))) {dev_err (asd->isp->dev,"dvs grid mismatch!\n" ); -/* If the grid info in the argument differs from the current -grid info, we tell the caller to reset the grid size and -try again. */ +/* +* If the grid info in the argument differs from the current +* grid info, we tell the caller to reset the grid size and +* try again. +*/ return -EAGAIN ; }
@@ -2518,9 +2530,11 @@ int atomisp_css_cp_dvs2_coefs(struct atomisp_sub_device *asd,if (sizeof (*cur) !=sizeof (dvs2_coefs.grid) ||memcmp (&dvs2_coefs.grid, cur,sizeof (dvs2_coefs.grid))) {dev_err (asd->isp->dev,"dvs grid mismatch!\n" ); -/* If the grid info in the argument differs from the current -grid info, we tell the caller to reset the grid size and -try again. */ +/* +* If the grid info in the argument differs from the current +* grid info, we tell the caller to reset the grid size and +* try again. +*/ return -EAGAIN ; }
@@ -3028,9 +3042,11 @@ int atomisp_param(struct atomisp_sub_device *asd, int flag,atomisp_curr_user_grid_info (asd, &config->info); -/* We always return the resolution and stride even if there is +/* +* We always return the resolution and stride even if there is * no valid metadata. This allows the caller to get the -* information needed to allocate user-space buffers. */ +* information needed to allocate user-space buffers. +*/ config->metadata_config.metadata_height = asd-> stream_env[ATOMISP_INPUT_STREAM_GENERAL ].stream_info. metadata_info.resolution.height;
@@ -3280,8 +3296,10 @@ atomisp_bytesperline_to_padded_width(unsigned int bytesperline,return bytesperline /2 ;case IA_CSS_FRAME_FORMAT_RGBA888 :return bytesperline /4 ; -/* The following cases could be removed, but we leave them -in to document the formats that are included. */ +/* +* The following cases could be removed, but we leave them +* in to document the formats that are included. +*/ case IA_CSS_FRAME_FORMAT_NV11 :case IA_CSS_FRAME_FORMAT_NV12 :case IA_CSS_FRAME_FORMAT_NV16 :
@@ -3317,9 +3335,11 @@ atomisp_v4l2_framebuffer_to_css_frame(const struct v4l2_framebuffer *arg, padded_width =atomisp_bytesperline_to_padded_width ( arg->fmt.bytesperline, sh_format); -/* Note: the padded width on an ia_css_frame is in elements, not in -bytes. The RAW frame we use here should always be a 16bit RAW -frame. This is why we bytesperline/2 is equal to the padded with */ +/* +* Note: the padded width on an ia_css_frame is in elements, not in +* bytes. The RAW frame we use here should always be a 16bit RAW +* frame. This is why we bytesperline/2 is equal to the padded with +*/ if (ia_css_frame_allocate (&res, arg->fmt.width, arg->fmt.height, sh_format, padded_width,0 )) { ret = -ENOMEM ;
@@ -3928,8 +3948,10 @@ static inline int atomisp_set_sensor_mipi_to_isp( asd->stream_env[stream_id].isys_info[1].height); } -/* Compatibility for sensors which provide no media bus code -* in s_mbus_framefmt() nor support pad formats. */ +/* +* Compatibility for sensors which provide no media bus code +* in s_mbus_framefmt() nor support pad formats. +*/ if (mipi_info && mipi_info->input_format !=-1 ) { bayer_order = mipi_info->raw_bayer_order;
@@ -4031,7 +4053,7 @@ static int css_input_resolution_changed(struct atomisp_sub_device *asd,/* * TODO: atomisp_css_preview_configure_pp_input() not -* reset due to CSS bug tracked as PSI BZ 115124 +* reset due to CSS bug tracked as PSI BZ 115124 */ }
@@ -4387,8 +4409,10 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)ATOMISP_SUBDEV_PAD_SINK , V4L2_SEL_TGT_CROP); -/* Try to enable YUV downscaling if ISP input is 10 % (either -* width or height) bigger than the desired result. */ +/* +* Try to enable YUV downscaling if ISP input is 10 % (either +* width or height) bigger than the desired result. +*/ if (!IS_MOFD || isp_sink_crop.width * 9 / 10 < f->fmt.pix.width || isp_sink_crop.height * 9 / 10 < f->fmt.pix.height ||
Signature · 1 line
2.43.0
Quoted 1 line · Ethan Lam
Fixed all block comment style warnings by checkpatch.pl.
...
Quoted 6 lines
/*
* DFS progress is shown as follows:
* 1. Target frequency is calculated according to FPS/Resolution/ISP running
- * mode.
+ * mode.
* 2. Ratio is calculated using formula: 2 * HPLL / target frequency - 1
Quoted 8 lines
- * with proper rounding.
+ * with proper rounding.
* 3. Set ratio to ISPFREQ40, 1 to FREQVALID and ISPFREQGUAR40
- * to 200MHz in ISPSSPM1.
+ * to 200MHz in ISPSSPM1.
* 4. Wait for FREQVALID to be cleared by P-Unit.
* 5. Wait for field ISPFREQSTAT40 in ISPSSPM1 turn to ratio set in 3. */
Please, use your common sense. The above is false-positive.
...
drivers/staging/media/atomisp/pci/atomisp_cmd.c irqreturn_t atomisp_isr_thread(int irq, void *isp_ptr) · line 972
Quoted 12 lines
drivers/staging/media/atomisp/pci/atomisp_cmd.c +4
-4* The standard CSS2.0 API tells the following calling sequence of * dequeue ready buffers: * while (ia_css_dequeue_psys_event(...)) { -* switch (event.type) { -* ... -* ia_css_pipe_dequeue_buffer() -* } +* switch (event.type) { +* ... +* ia_css_pipe_dequeue_buffer() +* } * }
No way, really.
...
You need to read the code and change wisely. NAK for this version. (I'm even not going to read the rest.)
Signature · 2 lines
With Best Regards, Andy Shevchenko