scsi: pm8001: clean up some inconsistent indenting
Subsystems (2)
PATCH v2 1/1 scsi: pm8001: clean up some inconsistent indenting
Eliminate the follow smatch warning:drivers/scsi/pm8001/pm8001_ctl.c:760 pm8001_update_flash() warn:
inconsistent indenting
---
Changes in v2:
--According to Damien's suggestion
1) Start multi-line comments with a line that has only "/*".
2) Align the conditions together to make this code more readable.
3) Using a local variable for value which is calculated too many times.
drivers/scsi/pm8001/pm8001_ctl.c | 61 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/scsi/pm8001/pm8001_ctl.c +31 -30
@@ -727,6 +727,8 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha)u32 sizeRead =0 ;u32 ret =0 ;u32 length =1024 *16 +sizeof (*payload) -1 ; +u32 fc_len =0 ; +u8 *read_buf;if (pm8001_ha->fw_image->size <28 ) { pm8001_ha->fw_status =FAIL_FILE_SIZE ;
@@ -755,36 +757,35 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) fwControl->retcode =0 ;/* OUT */ fwControl->offset = loopNumber *IOCTL_BUF_SIZE ;/*OUT */ -/* for the last chunk of data in case file size is not even with -4k, load only the rest*/ -if (((loopcount-loopNumber) ==1 ) && - ((partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE )) { - fwControl->len = - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ; -memcpy ((u8 *)fwControl->buffer, - (u8 *)pm8001_ha->fw_image->data + sizeRead, - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ); - sizeRead += - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ; - }else { -memcpy ((u8 *)fwControl->buffer, - (u8 *)pm8001_ha->fw_image->data + sizeRead, -IOCTL_BUF_SIZE ); - sizeRead +=IOCTL_BUF_SIZE ; - } - - pm8001_ha->nvmd_completion = &completion; - ret =PM8001_CHIP_DISP ->fw_flash_update_req (pm8001_ha, payload); -if (ret) { - pm8001_ha->fw_status =FAIL_OUT_MEMORY ; - goto out; - } -wait_for_completion (&completion); -if (fwControl->retcode >FLASH_UPDATE_IN_PROGRESS ) { - pm8001_ha->fw_status = fwControl->retcode; - ret = -EFAULT ; - goto out; - } +/* +* for the last chunk of data in case file size is +* not even with 4k, load only the rest +*/ + + fc_len = (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ; + read_buf = (u8 *)pm8001_ha->fw_image->data + sizeRead; + +if (((loopcount-loopNumber) ==1 ) && fc_len) { + fwControl->len = fc_len; +memcpy ((u8 *)fwControl->buffer, read_buf, fc_len); + sizeRead += fc_len; + }else { +memcpy ((u8 *)fwControl->buffer, read_buf,IOCTL_BUF_SIZE ); + sizeRead +=IOCTL_BUF_SIZE ; + } + + pm8001_ha->nvmd_completion = &completion; + ret =PM8001_CHIP_DISP ->fw_flash_update_req (pm8001_ha, payload); +if (ret) { + pm8001_ha->fw_status =FAIL_OUT_MEMORY ; + goto out; + } +wait_for_completion (&completion); +if (fwControl->retcode >FLASH_UPDATE_IN_PROGRESS ) { + pm8001_ha->fw_status = fwControl->retcode; + ret = -EFAULT ; + goto out; + } } } out:
Signature · 1 line
2.20.1.7.g153144c
Quoted 22 lines · Yang Li
Eliminate the follow smatch warning:
drivers/scsi/pm8001/pm8001_ctl.c:760pm8001_update_flash()warn:
inconsistent indentingReported-by Abaci Robot <[email protected]>Signed-off-by Yang Li <[email protected]>---
Changes in v2:
--According to Damien's suggestion
1) Start multi-line comments with a line that has only "/*".
2) Align the conditions together to make this code more readable.
3) Using a local variable for value which is calculated too many times.drivers/scsi/pm8001/pm8001_ctl.c | 61 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-)drivers/scsi/pm8001/pm8001_ctl.c +0
-0
drivers/scsi/pm8001/pm8001_ctl.c static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) · line 730
Quoted 4 lines
drivers/scsi/pm8001/pm8001_ctl.c +1
-0@@ -727,6 +727,8 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha)u32 sizeRead =0 ;u32 ret =0 ;u32 length =1024 *16 +sizeof (*payload) -1 ; +u32 fc_len =0 ;
I think that the "= 0" is not needed.
Quoted 34 lines
drivers/scsi/pm8001/pm8001_ctl.c +1
-26+u8 *read_buf;if (pm8001_ha->fw_image->size <28 ) { pm8001_ha->fw_status =FAIL_FILE_SIZE ;@@ -755,36 +757,35 @@ static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) fwControl->retcode =0 ;/* OUT */ fwControl->offset = loopNumber *IOCTL_BUF_SIZE ;/*OUT */ -/* for the last chunk of data in case file size is not even with -4k, load only the rest*/ -if (((loopcount-loopNumber) ==1 ) && - ((partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE )) { - fwControl->len = - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ; -memcpy ((u8 *)fwControl->buffer, - (u8 *)pm8001_ha->fw_image->data + sizeRead, - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ); - sizeRead += - (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ; - }else { -memcpy ((u8 *)fwControl->buffer, - (u8 *)pm8001_ha->fw_image->data + sizeRead, -IOCTL_BUF_SIZE ); - sizeRead +=IOCTL_BUF_SIZE ; - } - - pm8001_ha->nvmd_completion = &completion; - ret =PM8001_CHIP_DISP ->fw_flash_update_req (pm8001_ha, payload); -if (ret) { - pm8001_ha->fw_status =FAIL_OUT_MEMORY ; - goto out; - } -wait_for_completion (&completion); -if (fwControl->retcode >FLASH_UPDATE_IN_PROGRESS ) {
drivers/scsi/pm8001/pm8001_ctl.c static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) · line 765
Quoted 10 lines
drivers/scsi/pm8001/pm8001_ctl.c +6
-4- pm8001_ha->fw_status = fwControl->retcode; - ret = -EFAULT ; - goto out; - } +/* +* for the last chunk of data in case file size is +* not even with 4k, load only the rest +*/ + + fc_len = (partitionSize +HEADER_LEN ) %IOCTL_BUF_SIZE ;
I would move this line down, right above the "if" where the variable is used.
drivers/scsi/pm8001/pm8001_ctl.c static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) · line 768
Quoted 3 lines
drivers/scsi/pm8001/pm8001_ctl.c +3
-0+ read_buf = (u8 *)pm8001_ha->fw_image->data + sizeRead; + +if (((loopcount-loopNumber) ==1 ) && fc_len) {
While at it, please add spaces around the "-" and remove the unnecessary parenthesis:
if (loopcount - loopNumber == 1 && fc_len) {Quoted 13 lines
drivers/scsi/pm8001/pm8001_ctl.c +13
-0+ fwControl->len = fc_len; +memcpy ((u8 *)fwControl->buffer, read_buf, fc_len); + sizeRead += fc_len; + }else { +memcpy ((u8 *)fwControl->buffer, read_buf,IOCTL_BUF_SIZE ); + sizeRead +=IOCTL_BUF_SIZE ; + } + + pm8001_ha->nvmd_completion = &completion; + ret =PM8001_CHIP_DISP ->fw_flash_update_req (pm8001_ha, payload); +if (ret) { + pm8001_ha->fw_status =FAIL_OUT_MEMORY ; + goto out;
drivers/scsi/pm8001/pm8001_ctl.c static int pm8001_update_flash(struct pm8001_hba_info *pm8001_ha) · line 791
Quoted 10 lines
drivers/scsi/pm8001/pm8001_ctl.c +7
-0+ } +wait_for_completion (&completion); +if (fwControl->retcode >FLASH_UPDATE_IN_PROGRESS ) { + pm8001_ha->fw_status = fwControl->retcode; + ret = -EFAULT ; + goto out; + } } } out:
With that fixed, looks good.
Signature · 2 lines
Damien Le Moal Western Digital Research