staging: media: atomisp: code cleanup fixes
Subsystems (4)
PATCH 1/6 staging: media: atomisp: improve function argument alignment
In reply to Deepak R VarmaImprove multi-line function argument alignment according to the code style guidelines. Resolves checkpatch feedback: "Alignment should match open parenthesis".
---
Changes in v1:
- None.
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +2 -2
@@ -192,8 +192,8 @@ static int __gc0310_buf_reg_array(struct i2c_client *client, }static int __gc0310_write_reg_is_consecutive (struct i2c_client *client, -struct gc0310_write_ctrl *ctrl, -const struct gc0310_reg *next) +struct gc0310_write_ctrl *ctrl, +const struct gc0310_reg *next) {if (ctrl->index ==0 )return 1 ;
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +2 -2
@@ -171,8 +171,8 @@ static int __gc2235_buf_reg_array(struct i2c_client *client, }static int __gc2235_write_reg_is_consecutive (struct i2c_client *client, -struct gc2235_write_ctrl *ctrl, -const struct gc2235_reg *next) +struct gc2235_write_ctrl *ctrl, +const struct gc2235_reg *next) {if (ctrl->index ==0 )return 1 ;
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +2 -2
@@ -212,8 +212,8 @@ static int __ov2722_buf_reg_array(struct i2c_client *client, }static int __ov2722_write_reg_is_consecutive (struct i2c_client *client, -struct ov2722_write_ctrl *ctrl, -const struct ov2722_reg *next) +struct ov2722_write_ctrl *ctrl, +const struct ov2722_reg *next) {if (ctrl->index ==0 )return 1 ;
Signature · 1 line
2.25.1
cover staging: media: atomisp: code cleanup fixes
This patch set addresses different kinds of checkpatch WARNING and CHECK complaints.
Note: The patches should be applied in the ascending order.
Changes in v1:
Generic change:
1. The patch set is being resent from an email account that matches with the patch signed-of-by tag. Issue highlighted by Hans Verkuil.
Patch specific changes:
1. patch 1/6 : none
2. patch 2/6 : none
3. patch 3/6 : none
4. patch 4/6 : implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
5. patch 5/6 : none
6. patch 6/6: implement following changes suggested by Fabio Aiuto a. use dev_info instead of pr_info
b. update patch log message accordingly
Deepak R Varma (6):
staging: media: atomisp: improve function argument alignment
staging: media: atomisp: balance braces around if...else block
staging: media: atomisp: use __func__ over function names
staging: media: atomisp: reformat code comment blocks
staging: media: atomisp: fix CamelCase variable naming
staging: media: atomisp: replace raw printk() by dev_info()
.../media/atomisp/i2c/atomisp-gc0310.c | 14 +-- .../media/atomisp/i2c/atomisp-gc2235.c | 29 ++--- .../atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +- .../media/atomisp/i2c/atomisp-lm3554.c | 2 +- .../media/atomisp/i2c/atomisp-mt9m114.c | 106 ++++++++++-------- .../media/atomisp/i2c/atomisp-ov2680.c | 43 ++++--- .../media/atomisp/i2c/atomisp-ov2722.c | 10 +- 7 files changed, 116 insertions(+), 94 deletions(-)
Signature · 1 line
2.25.1
PATCH 2/6 staging: media: atomisp: balance braces around if...else block
Balance braces around the if else blocks as per the code style guidelines. Resolves checkpatch script CHECK / WARNING feedback messages.
---
Changes in v1:
- None.
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 7 ++++--- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +2 -2
@@ -872,9 +872,9 @@ static int gc0310_s_power(struct v4l2_subdev *sd, int on) {int ret; -if (on ==0 ) +if (on ==0 ) {return power_down (sd); -else { + }else { ret =power_up (sd);if (!ret)return gc0310_init (sd);
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +2 -2
@@ -658,9 +658,9 @@ static int gc2235_s_power(struct v4l2_subdev *sd, int on) {int ret; -if (on ==0 ) +if (on ==0 ) { ret =power_down (sd); -else { + }else { ret =power_up (sd);if (!ret) ret =__gc2235_init (sd);
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +2 -2
@@ -568,9 +568,9 @@ static int power_down(struct v4l2_subdev *sd)static int mt9m114_s_power (struct v4l2_subdev *sd,int power) { -if (power ==0 ) +if (power ==0 ) {return power_down (sd); -else { + }else {if (power_up (sd))return -EINVAL ;
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +4 -3
@@ -461,11 +461,12 @@ static int ov2680_v_flip(struct v4l2_subdev *sd, s32 value) ret =ov2680_read_reg (client,1 ,OV2680_FLIP_REG , &val);if (ret)return ret; -if (value) { + +if (value) val |=OV2680_FLIP_MIRROR_BIT_ENABLE ; - }else { +else val &= ~OV2680_FLIP_MIRROR_BIT_ENABLE ; - } + ret =ov2680_write_reg (client,1 ,OV2680_FLIP_REG , val);if (ret)
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +2 -2
@@ -772,9 +772,9 @@ static int ov2722_s_power(struct v4l2_subdev *sd, int on) {int ret; -if (on ==0 ) +if (on ==0 ) {return power_down (sd); -else { + }else { ret =power_up (sd);if (!ret)return ov2722_init (sd);
Signature · 1 line
2.25.1
PATCH 3/6 staging: media: atomisp: use __func__ over function names
In reply to Deepak R VarmaReplace hard coded function names from the debug print strings by standard __func__ predefined identifier. This resolves following checkpatch script WARNING:
Prefer using '"%s...", __func__' to using function's name, in a string.
---
Changes in v1:
- None.
.../staging/media/atomisp/i2c/atomisp-gc0310.c | 2 +- .../staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- .../staging/media/atomisp/i2c/atomisp-lm3554.c | 2 +- .../staging/media/atomisp/i2c/atomisp-ov2680.c | 16 ++++++++-------- .../staging/media/atomisp/i2c/atomisp-ov2722.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +1 -1
@@ -1292,7 +1292,7 @@ static int gc0310_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct gc0310_device *dev =to_gc0310_sensor (sd); -dev_dbg (&client->dev,"gc0310_remove...\n" ); +dev_dbg (&client->dev,"%s...\n" , __func__); dev->platform_data->csi_cfg (sd,0 );
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +1 -1
@@ -1034,7 +1034,7 @@ static int gc2235_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct gc2235_device *dev =to_gc2235_sensor (sd); -dev_dbg (&client->dev,"gc2235_remove...\n" ); +dev_dbg (&client->dev,"%s...\n" , __func__); dev->platform_data->csi_cfg (sd,0 );
drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +1 -1
@@ -680,7 +680,7 @@ static int lm3554_detect(struct v4l2_subdev *sd)int ret;if (!i2c_check_functionality (adapter,I2C_FUNC_SMBUS_BYTE_DATA )) { -dev_err (&client->dev,"lm3554_detect i2c error\n" ); +dev_err (&client->dev,"%s i2c error\n" , __func__);return -ENODEV ; }
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +8 -8
@@ -146,7 +146,7 @@ static int ov2680_g_bin_factor_x(struct v4l2_subdev *sd, s32 *val)struct ov2680_device *dev =to_ov2680_sensor (sd);struct i2c_client *client =v4l2_get_subdevdata (sd); -dev_dbg (&client->dev,"++++ov2680_g_bin_factor_x\n" ); +dev_dbg (&client->dev,"++++%s\n" , __func__); *val = ov2680_res[dev->fmt_idx].bin_factor_x;return 0 ;
@@ -158,7 +158,7 @@ static int ov2680_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val)struct i2c_client *client =v4l2_get_subdevdata (sd); *val = ov2680_res[dev->fmt_idx].bin_factor_y; -dev_dbg (&client->dev,"++++ov2680_g_bin_factor_y\n" ); +dev_dbg (&client->dev,"++++%s\n" , __func__);return 0 ; }
@@ -173,7 +173,7 @@ static int ov2680_get_intg_factor(struct i2c_client *client,u16 reg_val;int ret; -dev_dbg (&client->dev,"++++ov2680_get_intg_factor\n" ); +dev_dbg (&client->dev,"++++%s\n" , __func__);if (!info)return -EINVAL ;
@@ -251,8 +251,8 @@ static long __ov2680_set_exposure(struct v4l2_subdev *sd, int coarse_itg,int ret, exp_val;dev_dbg (&client->dev, -"+++++++__ov2680_set_exposure coarse_itg %d, gain %d, digitgain %d++\n" , - coarse_itg, gain, digitgain); +"+++++++%s coarse_itg %d, gain %d, digitgain %d++\n" , + __func__, coarse_itg, gain, digitgain); vts = ov2680_res[dev->fmt_idx].lines_per_frame;
@@ -1061,9 +1061,9 @@ static int ov2680_s_stream(struct v4l2_subdev *sd, int enable)mutex_lock (&dev->input_lock);if (enable) -dev_dbg (&client->dev,"ov2680_s_stream one\n" ); +dev_dbg (&client->dev,"%s one\n" , __func__);else -dev_dbg (&client->dev,"ov2680_s_stream off\n" ); +dev_dbg (&client->dev,"%s off\n" , __func__); ret = ov2680_write_reg(client, 1, OV2680_SW_STREAM, enable ? OV2680_START_STREAMING :
@@ -1227,7 +1227,7 @@ static int ov2680_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct ov2680_device *dev =to_ov2680_sensor (sd); -dev_dbg (&client->dev,"ov2680_remove...\n" ); +dev_dbg (&client->dev,"%s...\n" , __func__); dev->platform_data->csi_cfg (sd,0 );
drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +1 -1
@@ -1175,7 +1175,7 @@ static int ov2722_remove(struct i2c_client *client)struct v4l2_subdev *sd =i2c_get_clientdata (client);struct ov2722_device *dev =to_ov2722_sensor (sd); -dev_dbg (&client->dev,"ov2722_remove...\n" ); +dev_dbg (&client->dev,"%s...\n" , __func__); dev->platform_data->csi_cfg (sd,0 );v4l2_ctrl_handler_free (&dev->ctrl_handler);
Signature · 1 line
2.25.1
PATCH 4/6 staging: media: atomisp: reformat code comment blocks
In reply to Deepak R VarmaReformat code comment blocks according to the coding style guidelines. This resolves different checkpatch script WARNINGs around block comments.
---
Changes in v1:
- implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
.../media/atomisp/i2c/atomisp-gc2235.c | 19 ++++---- .../atomisp/i2c/atomisp-libmsrlisthelper.c | 6 ++- .../media/atomisp/i2c/atomisp-mt9m114.c | 46 +++++++++++-------- .../media/atomisp/i2c/atomisp-ov2680.c | 20 +++++--- 4 files changed, 56 insertions(+), 35 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +11 -8
@@ -228,7 +228,7 @@ static int gc2235_g_focal(struct v4l2_subdev *sd, s32 *val)static int gc2235_g_fnumber (struct v4l2_subdev *sd,s32 *val) { -/*const f number for imx*/ +/* const f number for imx */ *val = (GC2235_F_NUMBER_DEFAULT_NUM <<16 ) |GC2235_F_NUMBER_DEM ;return 0 ; }
@@ -427,7 +427,8 @@ static long gc2235_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)return 0 ; } -/* This returns the exposure time being used. This should only be used +/* +* This returns the exposure time being used. This should only be used * for filling in EXIF data, not for actual image processing. */ static int gc2235_q_exposure (struct v4l2_subdev *sd,s32 *value)
@@ -746,11 +747,12 @@ static int startup(struct v4l2_subdev *sd)int ret =0 ;if (is_init ==0 ) { -/* force gc2235 to do a reset in res change, otherwise it -* can not output normal after switching res. and it is not -* necessary for first time run up after power on, for the sack -* of performance -*/ +/* +* force gc2235 to do a reset in res change, otherwise it +* can not output normal after switching res. and it is not +* necessary for first time run up after power on, for the sack +* of performance +*/ power_down (sd);power_up (sd);gc2235_write_reg_array (client, gc2235_init_settings);
@@ -904,7 +906,8 @@ static int gc2235_s_config(struct v4l2_subdev *sd, (struct camera_sensor_platform_data *)platform_data;mutex_lock (&dev->input_lock); -/* power off the module, then power on it in future +/* +* power off the module, then power on it in future * as first power on by board may not fulfill the * power on sequqence needed by the module */
drivers/staging/media/atomisp/i2c/atomisp-libmsrlisthelper.c +4 -2
@@ -50,14 +50,16 @@ struct tbd_data_record_header {static int set_msr_configuration (struct i2c_client *client,uint8_t *bufptr,unsigned int size) { -/* The configuration data contains any number of sequences where +/* +* The configuration data contains any number of sequences where * the first byte (that is, uint8_t) that marks the number of bytes * in the sequence to follow, is indeed followed by the indicated * number of bytes of actual data to be written to sensor. * By convention, the first two bytes of actual data should be * understood as an address in the sensor address space (hibyte * followed by lobyte) where the remaining data in the sequence -* will be written. */ +* will be written. +*/ u8 *ptr = bufptr;
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +28 -18
119 lines not on this page · raw message
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +13 -7
@@ -127,7 +127,7 @@ static int ov2680_g_focal(struct v4l2_subdev *sd, s32 *val)static int ov2680_g_fnumber (struct v4l2_subdev *sd,s32 *val) { -/*const f number for ov2680*/ +/* const f number for ov2680 */ *val = (OV2680_F_NUMBER_DEFAULT_NUM <<16 ) |OV2680_F_NUMBER_DEM ;return 0 ;
@@ -399,7 +399,8 @@ static long ov2680_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)return 0 ; } -/* This returns the exposure time being used. This should only be used +/* +* This returns the exposure time being used. This should only be used * for filling in EXIF data, not for actual image processing. */ static int ov2680_q_exposure (struct v4l2_subdev *sd,s32 *value)
@@ -728,11 +729,13 @@ static int gpio_ctrl(struct v4l2_subdev *sd, bool flag)if (!dev || !dev->platform_data)return -ENODEV ; -/* The OV2680 documents only one GPIO input (#XSHUTDN), but +/* +* The OV2680 documents only one GPIO input (#XSHUTDN), but * existing integrations often wire two (reset/power_down) * because that is the way other sensors work. There is no * way to tell how it is wired internally, so existing -* firmwares expose both and we drive them symmetrically. */ +* firmwares expose both and we drive them symmetrically. +*/ if (flag) { ret = dev->platform_data->gpio0_ctrl (sd,1 );usleep_range (10000 ,15000 );
@@ -978,7 +981,8 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd, goto err; } -/*recall flip functions to avoid flip registers +/* +* recall flip functions to avoid flip registers * were overridden by default setting */ if (h_flag)
@@ -988,7 +992,8 @@ static int ov2680_set_fmt(struct v4l2_subdev *sd,v4l2_info (client,"\n%s idx %d\n" , __func__, dev->fmt_idx); -/*ret = startup(sd); +/* +* ret = startup(sd); * if (ret) * dev_err(&client->dev, "ov2680 startup err\n"); */
@@ -1097,7 +1102,8 @@ static int ov2680_s_config(struct v4l2_subdev *sd, (struct camera_sensor_platform_data *)platform_data;mutex_lock (&dev->input_lock); -/* power off the module, then power on it in future +/* +* power off the module, then power on it in future * as first power on by board may not fulfill the * power on sequqence needed by the module */
Signature · 1 line
2.25.1
PATCH 5/6 staging: media: atomisp: fix CamelCase variable naming
In reply to Deepak R VarmaMixed case variable names are discouraged and they result in checkpatch script "Avoid CamelCase" warnings. Replace such CamelCase variable names by lower case strings according to the coding style guidelines.
---
Changes in v1:
- None.
.../media/atomisp/i2c/atomisp-mt9m114.c | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +30 -30
@@ -1000,10 +1000,10 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,struct mt9m114_device *dev =to_mt9m114_sensor (sd);int ret =0 ;unsigned int coarse_integration =0 ; -unsigned int FLines =0 ; -unsigned int FrameLengthLines =0 ;/* ExposureTime.FrameLengthLines; */ -unsigned int AnalogGain, DigitalGain; -u32 AnalogGainToWrite =0 ; +unsigned int f_lines =0 ; +unsigned int frame_len_lines =0 ;/* ExposureTime.FrameLengthLines; */ +unsigned int analog_gain, digital_gain; +u32 analog_gain_to_write =0 ; dev_dbg(&client->dev, "%s(0x%X 0x%X 0x%X)\n", __func__, exposure->integration_time[0], exposure->gain[0],
@@ -1011,27 +1011,27 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, coarse_integration = exposure->integration_time[0 ];/* fine_integration = ExposureTime.FineIntegrationTime; */ -/* FrameLengthLines = ExposureTime.FrameLengthLines; */ - FLines = mt9m114_res[dev->res].lines_per_frame; - AnalogGain = exposure->gain[0 ]; - DigitalGain = exposure->gain[1 ]; +/* frame_len_lines = ExposureTime.FrameLengthLines; */ + f_lines = mt9m114_res[dev->res].lines_per_frame; + analog_gain = exposure->gain[0 ]; + digital_gain = exposure->gain[1 ];if (!dev->streamon) {/* Save the first exposure values while stream is off */ dev->first_exp = coarse_integration; - dev->first_gain = AnalogGain; - dev->first_diggain = DigitalGain; + dev->first_gain = analog_gain; + dev->first_diggain = digital_gain; } -/* DigitalGain = 0x400 * (((u16) DigitalGain) >> 8) + */ -/* ((unsigned int)(0x400 * (((u16) DigitalGain) & 0xFF)) >>8); */ +/* digital_gain = 0x400 * (((u16) digital_gain) >> 8) + */ +/* ((unsigned int)(0x400 * (((u16) digital_gain) & 0xFF)) >>8); */ /* set frame length */ -if (FLines < coarse_integration +6 ) - FLines = coarse_integration +6 ; -if (FLines < FrameLengthLines) - FLines = FrameLengthLines; - ret =mt9m114_write_reg (client,MISENSOR_16BIT ,0x300A , FLines); +if (f_lines < coarse_integration +6 ) + f_lines = coarse_integration +6 ; +if (f_lines < frame_len_lines) + f_lines = frame_len_lines; + ret =mt9m114_write_reg (client,MISENSOR_16BIT ,0x300A , f_lines);if (ret) { -v4l2_err (client,"%s: fail to set FLines\n" , __func__); +v4l2_err (client,"%s: fail to set f_lines\n" , __func__);return -EINVAL ; }
@@ -1049,39 +1049,39 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,/* * set analog/digital gain -switch(AnalogGain) +switch(analog_gain) { case 0: -AnalogGainToWrite = 0x0; +analog_gain_to_write = 0x0; break; case 1: -AnalogGainToWrite = 0x20; +analog_gain_to_write = 0x20; break; case 2: -AnalogGainToWrite = 0x60; +analog_gain_to_write = 0x60; break; case 4: -AnalogGainToWrite = 0xA0; +analog_gain_to_write = 0xA0; break; case 8: -AnalogGainToWrite = 0xE0; +analog_gain_to_write = 0xE0; break; default: -AnalogGainToWrite = 0x20; +analog_gain_to_write = 0x20; break; } */ -if (DigitalGain >=16 || DigitalGain <=1 ) - DigitalGain =1 ; +if (digital_gain >=16 || digital_gain <=1 ) + digital_gain =1 ;/* * AnalogGainToWrite = (u16)((DigitalGain << 12) | AnalogGainToWrite); */ - AnalogGainToWrite = (u16)((DigitalGain <<12 ) | (u16 )AnalogGain); + analog_gain_to_write = (u16)((digital_gain <<12 ) | (u16 )analog_gain); ret =mt9m114_write_reg (client,MISENSOR_16BIT , -REG_GAIN , AnalogGainToWrite); +REG_GAIN , analog_gain_to_write);if (ret) { -v4l2_err (client,"%s: fail to set AnalogGainToWrite\n" , +v4l2_err (client,"%s: fail to set analog_gain_to_write\n" , __func__);return -EINVAL ; }
Signature · 1 line
2.25.1
PATCH 6/6 staging: media: atomisp: replace raw printk() by dev_info()
In reply to Deepak R VarmaIt is better to use dev_info() instead of raw printk() call. This addresses the checkpatch complain for not using KERN_<LEVEL> facility in printk() call.
---
Changes in v1:
- implement following changes suggested by Fabio Aiuto a. use dev_info instead of pr_info
b. update patch log message accordingly
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +2 -2
@@ -1020,8 +1020,8 @@ static int gc0310_set_fmt(struct v4l2_subdev *sd,return -EINVAL ; } -printk ("%s: before gc0310_write_reg_array %s\n" , __func__, - gc0310_res[dev->fmt_idx].desc); +dev_info (&client->dev,"%s: before gc0310_write_reg_array %s\n" , + __func__, gc0310_res[dev->fmt_idx].desc); ret =startup (sd);if (ret) {dev_err (&client->dev,"gc0310 startup err\n" );
Signature · 1 line
2.25.1
Re: [PATCH v1 2/6] staging: media: atomisp: balance braces around if...else block
In reply to Deepak R VarmaQuoted 9 lines · Deepak R Varma
Balance braces around the if else blocks as per the code style guidelines. Resolves checkpatch script CHECK / WARNING feedback messages.
Signed-off-by Deepak R Varma <[email protected]>---
Changes in v1:
- None.
Quoted 7 lines
drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c | 4 ++-- drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 7 ++++--- drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-)
Hi,
the email subject prefix should be [PATCH v2 n/N], the previous patchset was v1 implicitly.
thank you,
fabio
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
In reply to Deepak R VarmaQuoted 11 lines · Deepak R Varma
Reformat code comment blocks according to the coding style guidelines. This resolves different checkpatch script WARNINGs around block comments.
Signed-off-by Deepak R Varma <[email protected]>---
Changes in v1:
- implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
If you want to tag me you should add the Suggested-by: tag in commit message before Signed-off-by tag...
$ vim +485 Documentation/process/submitting-patches.rst
thank you,
fabio
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 13 lines · Fabio Aiuto
Quoted 11 lines · Deepak R Varma
Reformat code comment blocks according to the coding style guidelines. This resolves different checkpatch script WARNINGs around block comments.
Signed-off-by Deepak R Varma <[email protected]>---
Changes in v1:
- implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
Quoted 4 lines
If you want to tag me you should add the Suggested-by: tag in commit message before Signed-off-by tag...
$ vim +485 Documentation/process/submitting-patches.rst
Yes, perfect. I will tag you in v3 accordingly.
Thank you.
deepak.
Quoted 4 lines
thank you,
fabio
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 17 lines · Deepak R Varma
Quoted 16 lines · Fabio Aiuto
Quoted 11 lines · Deepak R Varma
Reformat code comment blocks according to the coding style guidelines. This resolves different checkpatch script WARNINGs around block comments.
Signed-off-by Deepak R Varma <[email protected]>---
Changes in v1:
- implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.If you want to tag me you should add the Suggested-by: tag in commit message before Signed-off-by tag...
Quoted 6 lines
Quoted 1 line
$ vim +485 Documentation/process/submitting-patches.rstYes, perfect. I will tag you in v3 accordingly.
Thank you.
deepak.
feel free, you don't need:)
Quoted 7 lines
Quoted 5 lines
thank you,
fabio
thank you,
fabio
Hi Deepak,
Something weird is going on. This series didn't appear in patchwork
(https://patchwork.linuxtv.org/) and looking at lore.kernel.org:
it appears v3 was seen as replied to the v1 posts instead of a new thread.
It's probably related to the Message-Id field, which is the same for the v1 and v3 posts. Not really sure how you managed that :-)
Please repost so that the v3 series is picked up by patchwork.
Regards,
Hans
Quoted 56 lines · Deepak R Varma
This patch set addresses different kinds of checkpatch WARNING and CHECK complaints.
Note: The patches should be applied in the ascending order.
Changes since v2:
Generic change:
1. Correct patch versioning in patch subjectPatch Specific change:
1. patch 1/6 : none
2. patch 2/6 : none
3. patch 3/6 : none
4. patch 4/6 :
a. Tag Fabio Auito for the patch suggestion5. patch 5/6 : none
6. patch 6/6:
a. Tag Fabio Auito for the patch suggestionChanges since v1:
Generic change:
1. The patch set is being resent from an email account that matches with the patch signed-of-by tag. Issue highlighted by Hans Verkuil.Patch specific changes:
1. patch 1/6 : none
2. patch 2/6 : none
3. patch 3/6 : none
4. patch 4/6 : implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
5. patch 5/6 : none
6. patch 6/6: implement following changes suggested by Fabio Aiuto a. usedev_infoinstead ofpr_info
b. update patch log message accordinglyDeepak R Varma (6):
staging: media: atomisp: improve function argument alignment
staging: media: atomisp: balance braces around if...else block
staging: media: atomisp: use__func__over function names
staging: media: atomisp: reformat code comment blocks
staging: media: atomisp: fix CamelCase variable naming
staging: media: atomisp: replace rawprintk()bydev_info().../media/atomisp/i2c/atomisp-gc0310.c | 14 +-- .../media/atomisp/i2c/atomisp-gc2235.c | 29 ++--- .../atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +- .../media/atomisp/i2c/atomisp-lm3554.c | 2 +- .../media/atomisp/i2c/atomisp-mt9m114.c | 106 ++++++++++-------- .../media/atomisp/i2c/atomisp-ov2680.c | 43 ++++--- .../media/atomisp/i2c/atomisp-ov2722.c | 10 +- 7 files changed, 116 insertions(+), 94 deletions(-)
Quoted 5 lines · Hans Verkuil
Hi Deepak,
Something weird is going on. This series didn't appear in patchwork
(https://patchwork.linuxtv.org/) and looking at lore.kernel.org:
Quoted 8 lines
it appears v3 was seen as replied to the v1 posts instead of a new thread.
It's probably related to the Message-Id field, which is the same for the v1 and v3 posts. Not really sure how you managed that :-)
Please repost so that the v3 series is picked up by patchwork.
Hello Hans,
Thank you for looking into the patch set. I am really not sure what happened here. I followed the usual steps and resent the patch set with suggested changes. My apologies for the trouble.
I will resend the patch set as suggested. Is there anything I can validate at my end to ensure it is different before sending the set across?
Thank you,
deepak.
Quoted 63 lines
Regards,
Hans
Quoted 56 lines · Deepak R Varma
This patch set addresses different kinds of checkpatch WARNING and CHECK complaints.
Note: The patches should be applied in the ascending order.
Changes since v2:
Generic change:
1. Correct patch versioning in patch subjectPatch Specific change:
1. patch 1/6 : none
2. patch 2/6 : none
3. patch 3/6 : none
4. patch 4/6 :
a. Tag Fabio Auito for the patch suggestion5. patch 5/6 : none
6. patch 6/6:
a. Tag Fabio Auito for the patch suggestionChanges since v1:
Generic change:
1. The patch set is being resent from an email account that matches with the patch signed-of-by tag. Issue highlighted by Hans Verkuil.Patch specific changes:
1. patch 1/6 : none
2. patch 2/6 : none
3. patch 3/6 : none
4. patch 4/6 : implement following changes suggested by Fabio Aiuto a. Corrected commenting style
b. Similar style implemented for other comment blocks in
the same files.
5. patch 5/6 : none
6. patch 6/6: implement following changes suggested by Fabio Aiuto a. usedev_infoinstead ofpr_info
b. update patch log message accordinglyDeepak R Varma (6):
staging: media: atomisp: improve function argument alignment
staging: media: atomisp: balance braces around if...else block
staging: media: atomisp: use__func__over function names
staging: media: atomisp: reformat code comment blocks
staging: media: atomisp: fix CamelCase variable naming
staging: media: atomisp: replace rawprintk()bydev_info().../media/atomisp/i2c/atomisp-gc0310.c | 14 +-- .../media/atomisp/i2c/atomisp-gc2235.c | 29 ++--- .../atomisp/i2c/atomisp-libmsrlisthelper.c | 6 +- .../media/atomisp/i2c/atomisp-lm3554.c | 2 +- .../media/atomisp/i2c/atomisp-mt9m114.c | 106 ++++++++++-------- .../media/atomisp/i2c/atomisp-ov2680.c | 43 ++++--- .../media/atomisp/i2c/atomisp-ov2722.c | 10 +- 7 files changed, 116 insertions(+), 94 deletions(-)
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
In reply to Deepak R Varmadrivers/staging/media/atomisp/i2c/atomisp-mt9m114.c static long mt9m114_s_exposure(struct v4l2_subdev *sd, · line 1054
Quoted 9 lines · Deepak R Varma
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +1
-1@@ -1044,7 +1048,7 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, }/* -// set analog/digital gain +* set analog/digital gain switch(AnalogGain) { case 0:
How on earth does this compile?
Review static long mt9m114_s_exposure(struct v4l2_subdev *sd,
Quoted 1 line
(quoted diff) +0
-0@@ -1069,8 +1073,10 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,
regards,
dan carpenter
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 4 lines · Dan Carpenter
Quoted 3 lines · Deepak R Varma
(quoted diff) +0
-0@@ -1044,7 +1048,7 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, }
Quoted 8 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c static long mt9m114_s_exposure(struct v4l2_subdev *sd, · line 1054
Quoted 6 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +1
-1/* -// set analog/digital gain +* set analog/digital gain switch(AnalogGain) { case 0: How on earth does this compile?
There is a closing */ down under after the entire switch block. The change I made is within the comment block. I have compiled the built the driver successfully.
Please let me know if you are seeing a different issue here.
Thank you,
deepak.
Quoted 7 lines
Review static long mt9m114_s_exposure(struct v4l2_subdev *sd,
Quoted 2 lines
(quoted diff) +0
-0@@ -1069,8 +1073,10 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,regards,
dan carpenter
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 14 lines · Deepak R Varma
Quoted 4 lines · Dan Carpenter
Quoted 3 lines · Deepak R Varma
(quoted diff) +0
-0@@ -1044,7 +1048,7 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, }Quoted 8 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c static long mt9m114_s_exposure(struct v4l2_subdev *sd, · line 1054
Quoted 6 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +1
-1/* -// set analog/digital gain +* set analog/digital gain switch(AnalogGain) { case 0: How on earth does this compile?
Quoted 3 lines
There is a closing */ down under after the entire switch block. The change I made is within the comment block. I have compiled the built the driver successfully.
Oh... Duh. I thought you converted the // to /*. This patch doesn't make any sense though because originally it was commented out code, but now it's a commented out ball of code and notes.
Just delete any commented out code.
regards,
dan carpenter
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 15 lines · Dan Carpenter
Quoted 14 lines · Deepak R Varma
Quoted 12 lines · Dan Carpenter
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c static long mt9m114_s_exposure(struct v4l2_subdev *sd, · line 1054
Quoted 9 lines · Deepak R Varma
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +1
-1@@ -1044,7 +1048,7 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, }/* -// set analog/digital gain +* set analog/digital gain switch(AnalogGain) { case 0: How on earth does this compile?
Quoted 7 lines
Quoted 3 lines
There is a closing */ down under after the entire switch block. The change I made is within the comment block. I have compiled the built the driver successfully.
Oh... Duh. I thought you converted the // to /*. This patch doesn't make any sense though because originally it was commented out code, but now it's a commented out ball of code and notes.
No problem. It looks wrong with the limited lines in diff. Appreciate you looking at it though.
Is it okay if I send in a separate patch with comment clean up? There are several #if 0 code block directives for this driver that I believe can be taken off as well. Should I clean those up as well?
Regards,
deepak.
Quoted 6 lines
Just delete any commented out code.
regards,
dan carpenter
Re: [PATCH v1 4/6] staging: media: atomisp: reformat code comment blocks
Quoted 20 lines · Deepak R Varma
Quoted 19 lines · Dan Carpenter
Quoted 17 lines · Deepak R Varma
Quoted 4 lines · Dan Carpenter
Quoted 3 lines · Deepak R Varma
(quoted diff) +0
-0@@ -1044,7 +1048,7 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd, }Quoted 8 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c static long mt9m114_s_exposure(struct v4l2_subdev *sd, · line 1054
Quoted 6 lines
drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +1
-1/* -// set analog/digital gain +* set analog/digital gain switch(AnalogGain) { case 0: How on earth does this compile?
There is a closing */ down under after the entire switch block. The change I made is within the comment block. I have compiled the built the driver successfully.
Quoted 7 lines
Quoted 3 lines
Oh... Duh. I thought you converted the // to /*. This patch doesn't make any sense though because originally it was commented out code, but now it's a commented out ball of code and notes.
No problem. It looks wrong with the limited lines in diff. Appreciate you looking at it though.
Yeah. That's fine by me.
Quoted 3 lines
Is it okay if I send in a separate patch with comment clean up? There are several #if 0 code block directives for this driver that I believe can be taken off as well. Should I clean those up as well?
Yep. Delete those as well.
regards,
dan carpenter