Skip to contentSkip to conversation

scsi: pm8001: clean up some inconsistent indentin

PATCH Applied Yang Li 3 participants 4 messages Feb 8, 2022 – Feb 15, 2022

Subsystems (2)
lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH v3 1/1 scsi: pm8001: clean up some inconsistent indentin

Eliminate the follow smatch warning:
drivers/scsi/pm8001/pm8001_ctl.c:760 pm8001_update_flash() warn:
inconsistent indenting

---

Changes in v3:
--According to Damien's suggestion
1) "u32 fc_len = 0;" -> "u32 fc_len;".
2) Add spaces around the "-" and remove the unnecessary parenthesis.
3) Move "fc_len = (partitionSize + HEADER_LEN) % IOCTL_BUF_SIZE;"down, right above the "if" where the variable is used.

 drivers/scsi/pm8001/pm8001_ctl.c | 61 ++++++++++++++++----------------
 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/scsi/pm8001/pm8001_ctl.c +31 -30
index 41a63c9b719b..66307783c73c 100644
@@ -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;
+	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
+			 */
+
+			read_buf  = (u8 *)pm8001_ha->fw_image->data + sizeRead;
+			fc_len = (partitionSize + HEADER_LEN) % IOCTL_BUF_SIZE;
+
+			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
Acked-by on v3 1/1
#1 lore raw
Quoted 7 lines · Yang Li

Eliminate the follow smatch warning:
drivers/scsi/pm8001/pm8001_ctl.c:760 pm8001_update_flash() warn:
inconsistent indenting

Thanks!

Quoted 94 lines

---

Changes in v3:
--According to Damien's suggestion
1) "u32 fc_len = 0;" -> "u32 fc_len;".
2) Add spaces around the "-" and remove the unnecessary parenthesis.
3) Move "fc_len = (partitionSize + HEADER_LEN) % IOCTL_BUF_SIZE;"down, right above the "if" where the variable is used.

 drivers/scsi/pm8001/pm8001_ctl.c | 61 ++++++++++++++++----------------
 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/scsi/pm8001/pm8001_ctl.c +31 -31
index 41a63c9b719b..66307783c73c 100644
@@ -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;
+       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
+                        */
+
+                       read_buf  = (u8 *)pm8001_ha->fw_image->data + sizeRead;
+                       fc_len = (partitionSize + HEADER_LEN) % IOCTL_BUF_SIZE;
+
+                       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:
--

2.20.1.7.g153144c

#2 lore raw
In reply to Yang Li

Yang,

Quoted 3 lines

Eliminate the follow smatch warning:
drivers/scsi/pm8001/pm8001_ctl.c:760 pm8001_update_flash() warn:
inconsistent indenting

Applied to 5.18/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering