scsi: pm8001: Clean up white space · tjh.dev/kernel@8a23dbc

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

scsi: pm8001: Clean up white space

checkpatch reports the following:

ERROR: space prohibited before that ',' (ctx:WxW)
+int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb);

Remove unnecessary whitespace.

Link: https://lore.kernel.org/r/1617886593-36421-2-git-send-email-luojiaxing@huawei.com
Acked-by: Jack Wang <jinpu.wang@ionos.com>
Signed-off-by: Luo Jiaxing <luojiaxing@huawei.com>
Signed-off-by: Jianqin Xie <xiejianqin@hisilicon.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Luo Jiaxing and committed by

Martin K. Petersen 5 years ago 8a23dbc6 40fa7394

+39 -36

6 changed files

expand all

drivers

scsi

pm8001

pm8001_ctl.c

pm8001_ctl.h

pm8001_hwi.c

pm8001_sas.c

pm8001_sas.h

pm80xx_hwi.c

+9 -11

drivers/scsi/pm8001/pm8001_ctl.c

··· 369 369 struct Scsi_Host *shost = class_to_shost(cdev); 370 370 struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); 371 371 struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; 372 + u8 *ptr = (u8 *)pm8001_ha->memoryMap.region[AAP1].virt_ptr; 372 373 int i; 373 - #define AAP1_MEMMAP(r, c) \ 374 - (*(u32 *)((u8*)pm8001_ha->memoryMap.region[AAP1].virt_ptr + (r) * 32 \ 375 - + (c))) 376 374 377 375 char *str = buf; 378 376 int max = 2; 379 377 for (i = 0; i < max; i++) { 380 378 str += sprintf(str, "0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x" 381 379 "0x%08x 0x%08x\n", 382 - AAP1_MEMMAP(i, 0), 383 - AAP1_MEMMAP(i, 4), 384 - AAP1_MEMMAP(i, 8), 385 - AAP1_MEMMAP(i, 12), 386 - AAP1_MEMMAP(i, 16), 387 - AAP1_MEMMAP(i, 20), 388 - AAP1_MEMMAP(i, 24), 389 - AAP1_MEMMAP(i, 28)); 380 + pm8001_ctl_aap1_memmap(ptr, i, 0), 381 + pm8001_ctl_aap1_memmap(ptr, i, 4), 382 + pm8001_ctl_aap1_memmap(ptr, i, 8), 383 + pm8001_ctl_aap1_memmap(ptr, i, 12), 384 + pm8001_ctl_aap1_memmap(ptr, i, 16), 385 + pm8001_ctl_aap1_memmap(ptr, i, 20), 386 + pm8001_ctl_aap1_memmap(ptr, i, 24), 387 + pm8001_ctl_aap1_memmap(ptr, i, 28)); 390 388 } 391 389 392 390 return str - buf;

drivers/scsi/pm8001/pm8001_ctl.h

··· 59 59 #define SYSFS_OFFSET 1024 60 60 #define PM80XX_IB_OB_QUEUE_SIZE (32 * 1024) 61 61 #define PM8001_IB_OB_QUEUE_SIZE (16 * 1024) 62 + 63 + static inline u32 pm8001_ctl_aap1_memmap(u8 *ptr, int idx, int off) 64 + { 65 + return *(u32 *)(ptr + idx * 32 + off); 66 + } 62 67 #endif /* PM8001_CTL_H_INCLUDED */ 63 68

+7 -7

drivers/scsi/pm8001/pm8001_hwi.c

··· 1826 1826 * that the task has been finished. 1827 1827 */ 1828 1828 static void 1829 - mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb) 1829 + mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) 1830 1830 { 1831 1831 struct sas_task *t; 1832 1832 struct pm8001_ccb_info *ccb; ··· 2058 2058 } 2059 2059 2060 2060 /*See the comments for mpi_ssp_completion */ 2061 - static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb) 2061 + static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 2062 2062 { 2063 2063 struct sas_task *t; 2064 2064 unsigned long flags; ··· 2294 2294 (status != IO_UNDERFLOW)) { 2295 2295 if (!((t->dev->parent) && 2296 2296 (dev_is_expander(t->dev->parent->dev_type)))) { 2297 - for (i = 0 , j = 4; j <= 7 && i <= 3; i++ , j++) 2297 + for (i = 0, j = 4; j <= 7 && i <= 3; i++, j++) 2298 2298 sata_addr_low[i] = pm8001_ha->sas_addr[j]; 2299 - for (i = 0 , j = 0; j <= 3 && i <= 3; i++ , j++) 2299 + for (i = 0, j = 0; j <= 3 && i <= 3; i++, j++) 2300 2300 sata_addr_hi[i] = pm8001_ha->sas_addr[j]; 2301 2301 memcpy(&temp_sata_addr_low, sata_addr_low, 2302 2302 sizeof(sata_addr_low)); ··· 2625 2625 } 2626 2626 2627 2627 /*See the comments for mpi_ssp_completion */ 2628 - static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb) 2628 + static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 2629 2629 { 2630 2630 struct sas_task *t; 2631 2631 struct task_status_struct *ts; ··· 3602 3602 return 0; 3603 3603 } 3604 3604 3605 - int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb) 3605 + int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 3606 3606 { 3607 3607 u32 status; 3608 3608 int i; ··· 3685 3685 * @pm8001_ha: our hba card information 3686 3686 * @piomb: IO message buffer 3687 3687 */ 3688 - static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void* piomb) 3688 + static int mpi_hw_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 3689 3689 { 3690 3690 unsigned long flags; 3691 3691 struct hw_event_resp *pPayload =

+10 -10

drivers/scsi/pm8001/pm8001_sas.c

··· 877 877 pm8001_dev->device_id, pm8001_dev->dev_type); 878 878 if (atomic_read(&pm8001_dev->running_req)) { 879 879 spin_unlock_irqrestore(&pm8001_ha->lock, flags); 880 - pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , 881 - dev, 1, 0); 880 + pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, 881 + dev, 1, 0); 882 882 while (atomic_read(&pm8001_dev->running_req)) 883 883 msleep(20); 884 884 spin_lock_irqsave(&pm8001_ha->lock, flags); ··· 1014 1014 goto out; 1015 1015 } 1016 1016 msleep(2000); 1017 - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , 1018 - dev, 1, 0); 1017 + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, 1018 + dev, 1, 0); 1019 1019 if (rc) { 1020 1020 pm8001_dbg(pm8001_ha, EH, "task abort failed %x\n" 1021 1021 "with rc %d\n", pm8001_dev->device_id, rc); ··· 1060 1060 goto out; 1061 1061 } 1062 1062 /* send internal ssp/sata/smp abort command to FW */ 1063 - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , 1064 - dev, 1, 0); 1063 + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, 1064 + dev, 1, 0); 1065 1065 msleep(100); 1066 1066 1067 1067 /* deregister the target device */ ··· 1076 1076 wait_for_completion(&completion_setstate); 1077 1077 } else { 1078 1078 /* send internal ssp/sata/smp abort command to FW */ 1079 - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , 1080 - dev, 1, 0); 1079 + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, 1080 + dev, 1, 0); 1081 1081 msleep(100); 1082 1082 1083 1083 /* deregister the target device */ ··· 1105 1105 DECLARE_COMPLETION_ONSTACK(completion_setstate); 1106 1106 if (dev_is_sata(dev)) { 1107 1107 struct sas_phy *phy = sas_get_local_phy(dev); 1108 - rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev , 1109 - dev, 1, 0); 1108 + rc = pm8001_exec_internal_task_abort(pm8001_ha, pm8001_dev, 1109 + dev, 1, 0); 1110 1110 rc = sas_phy_reset(phy, 1); 1111 1111 sas_put_local_phy(phy); 1112 1112 pm8001_dev->setds_completion = &completion_setstate;

+1 -1

drivers/scsi/pm8001/pm8001_sas.h

··· 704 704 int pm8001_mpi_dereg_resp(struct pm8001_hba_info *pm8001_ha, void *piomb); 705 705 int pm8001_mpi_fw_flash_update_resp(struct pm8001_hba_info *pm8001_ha, 706 706 void *piomb); 707 - int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha , void *piomb); 707 + int pm8001_mpi_general_event(struct pm8001_hba_info *pm8001_ha, void *piomb); 708 708 int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb); 709 709 struct sas_task *pm8001_alloc_task(void); 710 710 void pm8001_task_done(struct sas_task *task);

+7 -7

drivers/scsi/pm8001/pm80xx_hwi.c

··· 90 90 struct sas_ha_struct *sha = SHOST_TO_SAS_HA(shost); 91 91 struct pm8001_hba_info *pm8001_ha = sha->lldd_ha; 92 92 void __iomem *fatal_table_address = pm8001_ha->fatal_tbl_addr; 93 - u32 accum_len , reg_val, index, *temp; 93 + u32 accum_len, reg_val, index, *temp; 94 94 u32 status = 1; 95 95 unsigned long start; 96 96 u8 *direct_data; ··· 1904 1904 * that the task has been finished. 1905 1905 */ 1906 1906 static void 1907 - mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha , void *piomb) 1907 + mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) 1908 1908 { 1909 1909 struct sas_task *t; 1910 1910 struct pm8001_ccb_info *ccb; ··· 2194 2194 } 2195 2195 2196 2196 /*See the comments for mpi_ssp_completion */ 2197 - static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha , void *piomb) 2197 + static void mpi_ssp_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 2198 2198 { 2199 2199 struct sas_task *t; 2200 2200 unsigned long flags; ··· 2444 2444 (status != IO_UNDERFLOW)) { 2445 2445 if (!((t->dev->parent) && 2446 2446 (dev_is_expander(t->dev->parent->dev_type)))) { 2447 - for (i = 0 , j = 4; i <= 3 && j <= 7; i++ , j++) 2447 + for (i = 0, j = 4; i <= 3 && j <= 7; i++, j++) 2448 2448 sata_addr_low[i] = pm8001_ha->sas_addr[j]; 2449 - for (i = 0 , j = 0; i <= 3 && j <= 3; i++ , j++) 2449 + for (i = 0, j = 0; i <= 3 && j <= 3; i++, j++) 2450 2450 sata_addr_hi[i] = pm8001_ha->sas_addr[j]; 2451 2451 memcpy(&temp_sata_addr_low, sata_addr_low, 2452 2452 sizeof(sata_addr_low)); ··· 2788 2788 } 2789 2789 2790 2790 /*See the comments for mpi_ssp_completion */ 2791 - static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha , void *piomb) 2791 + static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) 2792 2792 { 2793 2793 struct sas_task *t; 2794 2794 struct task_status_struct *ts; ··· 4918 4918 u32 operation, u32 phyid, 4919 4919 u32 length, u32 *buf) 4920 4920 { 4921 - u32 tag , i, j = 0; 4921 + u32 tag, i, j = 0; 4922 4922 int rc; 4923 4923 struct set_phy_profile_req payload; 4924 4924 struct inbound_queue_table *circularQ;