General coding style clean-up
Subsystems (4)
v3 cover General coding style clean-up
This patchset fixes several checkpatch.pl warnings in atomisp_ioctl.c that have been distributed across 2 patches logically.
Rahul Gottipati (2):
media: atomisp: Fix coding style issue - remove beginning whitespaces
media: atomisp: Fix coding style issue - correct multiline comments
.../staging/media/atomisp/pci/atomisp_ioctl.c | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-)
Signature · 1 line
2.25.1
PATCH v3 1/2 media: atomisp: Fix coding style issue - remove beginning whitespaces
This removes whitespaces at the beginning of a few lines to fix some checkpatch.pl warnings.
---
Changes in v3:
Changed style of function headers in response to review comments
Changes in v2:
Distributed changes across 2 patches instead of the previous 1
drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +6 -6
@@ -511,8 +511,8 @@ const struct atomisp_format_bridge atomisp_output_fmts[] = {#endif }; -const struct atomisp_format_bridge *atomisp_get_format_bridge ( -unsigned int pixelformat) +const struct atomisp_format_bridge * +atomisp_get_format_bridge (unsigned int pixelformat) {unsigned int i;
@@ -524,8 +524,8 @@ const struct atomisp_format_bridge *atomisp_get_format_bridge(return NULL ; } -const struct atomisp_format_bridge *atomisp_get_format_bridge_from_mbus ( -u32 mbus_code) +const struct atomisp_format_bridge * +atomisp_get_format_bridge_from_mbus (u32 mbus_code) {unsigned int i;
@@ -606,8 +606,8 @@ static int atomisp_enum_input(struct file *file, void *fh,return 0 ; } -static unsigned int atomisp_subdev_streaming_count ( -struct atomisp_sub_device *asd) +static unsigned int +atomisp_subdev_streaming_count (struct atomisp_sub_device *asd) {return asd->video_out_preview.capq.streaming + asd->video_out_capture.capq.streaming
Signature · 1 line
2.25.1
PATCH v3 2/2 media: atomisp: Fix coding style issue - correct multiline comments
In reply to Rahul GottipatiThis fixes some coding style issues of multiline comments to correct a few checkpatch.pl warnings.
---
Changes in v3:
Made changes to keep first line blank in multiline comments.
Changes in v2:
Distributed changes across 2 patches instead of the previous 1.
.../staging/media/atomisp/pci/atomisp_ioctl.c | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_ioctl.c +17 -9
@@ -1275,13 +1275,15 @@ static int atomisp_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf) } } -/* Workaround: Due to the design of HALv3, +/* +* Workaround: Due to the design of HALv3, * sometimes in ZSL or SDV mode HAL needs to * capture multiple images within one streaming cycle. * But the capture number cannot be determined by HAL. * So HAL only sets the capture number to be 1 and queue multiple * buffers. Atomisp driver needs to check this case and re-trigger -* CSS to do capture when new buffer is queued. */ +* CSS to do capture when new buffer is queued. +*/ if (asd->continuous_mode->val && atomisp_subdev_source_pad(vdev) == ATOMISP_SUBDEV_PAD_SOURCE_CAPTURE &&
@@ -1806,7 +1808,7 @@ static int atomisp_streamon(struct file *file, void *fh,/* * set freq to max when streaming count > 1 which indicate * dual camera would run -*/ +*/ if (atomisp_streaming_count (isp) >1 ) {if (atomisp_freq_scaling (isp,ATOMISP_DFS_MODE_MAX , false) <0 )
@@ -2437,8 +2439,10 @@ static int atomisp_g_ext_ctrls(struct file *file, void *fh,struct v4l2_control ctrl;int i, ret =0 ; -/* input_lock is not need for the Camera related IOCTLs -* The input_lock downgrade the FPS of 3A*/ +/* +* input_lock is not need for the Camera related IOCTLs +* The input_lock downgrade the FPS of 3A +*/ ret =atomisp_camera_g_ext_ctrls (file, fh, c);if (ret != -EINVAL )return ret;
@@ -2520,8 +2524,10 @@ static int atomisp_camera_s_ext_ctrls(struct file *file, void *fh, ret =v4l2_s_ctrl (NULL , isp->flash->ctrl_handler, &ctrl); -/* When flash mode is changed we need to reset -* flash state */ +/* +* When flash mode is changed we need to reset +* flash state +*/ if (ctrl.id ==V4L2_CID_FLASH_MODE ) { asd->params.flash_state =ATOMISP_FLASH_IDLE ;
@@ -2559,8 +2565,10 @@ static int atomisp_s_ext_ctrls(struct file *file, void *fh,struct v4l2_control ctrl;int i, ret =0 ; -/* input_lock is not need for the Camera related IOCTLs -* The input_lock downgrade the FPS of 3A*/ +/* +* input_lock is not need for the Camera related IOCTLs +* The input_lock downgrade the FPS of 3A +*/ ret =atomisp_camera_s_ext_ctrls (file, fh, c);if (ret != -EINVAL )return ret;
Signature · 1 line
2.25.1