scsi: pm8001: Further neatening and whitespace
Subsystems (2)
cover scsi: pm8001: Further neatening and whitespace
Make the logging macro uses clearer and fix a whitespace defect.
Joe Perches (2):
scsi: pm8001: Convert pm8001_printk to pm8001_info
scsi: pm8001: Fix misindentation
drivers/scsi/pm8001/pm8001_init.c | 32 +++++++++++++++---------------- drivers/scsi/pm8001/pm8001_sas.c | 4 ++-- drivers/scsi/pm8001/pm8001_sas.h | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-)
Signature · 1 line
2.26.0
PATCH 1/2 scsi: pm8001: Convert pm8001_printk to pm8001_info
Use the more common logging style.
--- drivers/scsi/pm8001/pm8001_init.c | 12 ++++++------ drivers/scsi/pm8001/pm8001_sas.c | 4 ++-- drivers/scsi/pm8001/pm8001_sas.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +6 -6
@@ -1293,8 +1293,8 @@ static int pm8001_pci_suspend(struct pci_dev *pdev, pm_message_t state)tasklet_kill (&pm8001_ha->tasklet[j]);#endif device_state =pci_choose_state (pdev, state); -pm8001_printk (pm8001_ha,"pdev=0x%p, slot=%s, entering operating state [D%d]\n" , - pdev, pm8001_ha->name, device_state); +pm8001_info (pm8001_ha,"pdev=0x%p, slot=%s, entering operating state [D%d]\n" , + pdev, pm8001_ha->name, device_state);pci_save_state (pdev);pci_disable_device (pdev);pci_set_power_state (pdev, device_state);
@@ -1318,16 +1318,16 @@ static int pm8001_pci_resume(struct pci_dev *pdev) pm8001_ha = sha->lldd_ha; device_state = pdev->current_state; -pm8001_printk (pm8001_ha,"pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n" , - pdev, pm8001_ha->name, device_state); +pm8001_info (pm8001_ha,"pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n" , + pdev, pm8001_ha->name, device_state);pci_set_power_state (pdev,PCI_D0 );pci_enable_wake (pdev,PCI_D0 ,0 );pci_restore_state (pdev); rc =pci_enable_device (pdev);if (rc) { -pm8001_printk (pm8001_ha,"slot=%s Enable device failed during resume\n" , - pm8001_ha->name); +pm8001_info (pm8001_ha,"slot=%s Enable device failed during resume\n" , + pm8001_ha->name); goto err_out_enable; }
drivers/scsi/pm8001/pm8001_sas.c +2 -2
@@ -1191,7 +1191,7 @@ int pm8001_abort_task(struct sas_task *task) phy_id = pm8001_dev->attached_phy; ret =pm8001_find_tag (task, &tag);if (ret ==0 ) { -pm8001_printk (pm8001_ha,"no tag for task:%p\n" , task); +pm8001_info (pm8001_ha,"no tag for task:%p\n" , task);return TMF_RESP_FUNC_FAILED ; }spin_lock_irqsave (&task->task_state_lock, flags);
@@ -1313,7 +1313,7 @@ int pm8001_abort_task(struct sas_task *task) task->slow_task =NULL ;spin_unlock_irqrestore (&task->task_state_lock, flags);if (rc !=TMF_RESP_FUNC_COMPLETE ) -pm8001_printk (pm8001_ha,"rc= %d\n" , rc); +pm8001_info (pm8001_ha,"rc= %d\n" , rc);return rc; }
drivers/scsi/pm8001/pm8001_sas.h +2 -2
@@ -70,14 +70,14 @@#define PM8001_DEVIO_LOGGING 0x100/* development io message logging */ #define PM8001_IOERR_LOGGING 0x200/* development io err message logging */ -#define pm8001_printk (HBA , fmt, ...) \ +#define pm8001_info (HBA , fmt, ...) \ pr_info("%s:: %s %d:" fmt, \ (HBA)->name, __func__, __LINE__, ##__VA_ARGS__)#define pm8001_dbg (HBA , level, fmt, ...) \ do { \ if (unlikely((HBA)->logging_level & PM8001_##level##_LOGGING)) \ - pm8001_printk(HBA, fmt, ##__VA_ARGS__); \ + pm8001_info(HBA, fmt, ##__VA_ARGS__); \ } while (0)#define PM8001_USE_TASKLET
Signature · 1 line
2.26.0
Re: [PATCH 1/2] scsi: pm8001: Convert pm8001_printk to pm8001_info
Quoted 4 lines · Joe Perches
Use the more common logging style.
Signed-off-by Joe Perches <[email protected]>
Thanks!
Quoted 88 lines
--- drivers/scsi/pm8001/pm8001_init.c | 12 ++++++------ drivers/scsi/pm8001/pm8001_sas.c | 4 ++-- drivers/scsi/pm8001/pm8001_sas.h | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)drivers/scsi/pm8001/pm8001_init.c +6
-6@@ -1293,8 +1293,8 @@ static int pm8001_pci_suspend(struct pci_dev *pdev, pm_message_t state)tasklet_kill (&pm8001_ha->tasklet[j]);#endif device_state =pci_choose_state (pdev, state); -pm8001_printk (pm8001_ha,"pdev=0x%p, slot=%s, entering operating state [D%d]\n" , - pdev, pm8001_ha->name, device_state); +pm8001_info (pm8001_ha,"pdev=0x%p, slot=%s, entering operating state [D%d]\n" , + pdev, pm8001_ha->name, device_state);pci_save_state (pdev);pci_disable_device (pdev);pci_set_power_state (pdev, device_state);@@ -1318,16 +1318,16 @@ static int pm8001_pci_resume(struct pci_dev *pdev) pm8001_ha = sha->lldd_ha; device_state = pdev->current_state; -pm8001_printk (pm8001_ha,"pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n" , - pdev, pm8001_ha->name, device_state); +pm8001_info (pm8001_ha,"pdev=0x%p, slot=%s, resuming from previous operating state [D%d]\n" , + pdev, pm8001_ha->name, device_state);pci_set_power_state (pdev,PCI_D0 );pci_enable_wake (pdev,PCI_D0 ,0 );pci_restore_state (pdev); rc =pci_enable_device (pdev);if (rc) { -pm8001_printk (pm8001_ha,"slot=%s Enable device failed during resume\n" , - pm8001_ha->name); +pm8001_info (pm8001_ha,"slot=%s Enable device failed during resume\n" , + pm8001_ha->name); goto err_out_enable; }drivers/scsi/pm8001/pm8001_sas.c +2
-2@@ -1191,7 +1191,7 @@ int pm8001_abort_task(struct sas_task *task) phy_id = pm8001_dev->attached_phy; ret =pm8001_find_tag (task, &tag);if (ret ==0 ) { -pm8001_printk (pm8001_ha,"no tag for task:%p\n" , task); +pm8001_info (pm8001_ha,"no tag for task:%p\n" , task);return TMF_RESP_FUNC_FAILED ; }spin_lock_irqsave (&task->task_state_lock, flags);@@ -1313,7 +1313,7 @@ int pm8001_abort_task(struct sas_task *task) task->slow_task =NULL ;spin_unlock_irqrestore (&task->task_state_lock, flags);if (rc !=TMF_RESP_FUNC_COMPLETE ) -pm8001_printk (pm8001_ha,"rc= %d\n" , rc); +pm8001_info (pm8001_ha,"rc= %d\n" , rc);return rc; }drivers/scsi/pm8001/pm8001_sas.h +2
-3@@ -70,14 +70,14 @@#define PM8001_DEVIO_LOGGING 0x100/* development io message logging */ #define PM8001_IOERR_LOGGING 0x200/* development io err message logging */ -#define pm8001_printk (HBA , fmt, ...) \ +#define pm8001_info (HBA , fmt, ...) \ pr_info("%s:: %s %d:" fmt, \ (HBA)->name, __func__, __LINE__, ##__VA_ARGS__)#define pm8001_dbg (HBA , level, fmt, ...) \ do { \ if (unlikely((HBA)->logging_level & PM8001_##level##_LOGGING)) \ - pm8001_printk(HBA, fmt, ##__VA_ARGS__); \ + pm8001_info(HBA, fmt, ##__VA_ARGS__); \ } while (0)#define PM8001_USE_TASKLET --2.26.0
PATCH 2/2 scsi: pm8001: Fix misindentation
In reply to Joe Percheskernel robot reported a misindentation of a goto.
Fix it.
At the same time, use a temporary for a repeated entry in the same block to reduce visual noise.
--- drivers/scsi/pm8001/pm8001_init.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/scsi/pm8001/pm8001_init.c +10 -10
@@ -386,17 +386,17 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, pm8001_ha->memoryMap.region[FORENSIC_MEM ].element_size =0x10000 ; pm8001_ha->memoryMap.region[FORENSIC_MEM ].alignment =0x10000 ;for (i =0 ; i < pm8001_ha->max_memcnt; i++) { +struct mpi_mem *region = &pm8001_ha->memoryMap.region[i]; +if (pm8001_mem_alloc (pm8001_ha->pdev, - &pm8001_ha->memoryMap.region[i].virt_ptr, - &pm8001_ha->memoryMap.region[i].phys_addr, - &pm8001_ha->memoryMap.region[i].phys_addr_hi, - &pm8001_ha->memoryMap.region[i].phys_addr_lo, - pm8001_ha->memoryMap.region[i].total_len, - pm8001_ha->memoryMap.region[i].alignment) !=0 ) { -pm8001_dbg (pm8001_ha,FAIL , -"Mem%d alloc failed\n" , - i); - goto err_out; + ®ion->virt_ptr, + ®ion->phys_addr, + ®ion->phys_addr_hi, + ®ion->phys_addr_lo, + region->total_len, + region->alignment) !=0 ) { +pm8001_dbg (pm8001_ha,FAIL ,"Mem%d alloc failed\n" , i); + goto err_out; } }
Signature · 1 line
2.26.0
Re: [PATCH 2/2] scsi: pm8001: Fix misindentation
Quoted 10 lines · Joe Perches
kernel robot reported a misindentation of a goto.
Fix it.
At the same time, use a temporary for a repeated entry in the same block to reduce visual noise.
Reported-by kernel test robot <[email protected]>Signed-off-by Joe Perches <[email protected]>
Quoted 39 lines
--- drivers/scsi/pm8001/pm8001_init.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)drivers/scsi/pm8001/pm8001_init.c +10
-11@@ -386,17 +386,17 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, pm8001_ha->memoryMap.region[FORENSIC_MEM ].element_size =0x10000 ; pm8001_ha->memoryMap.region[FORENSIC_MEM ].alignment =0x10000 ;for (i =0 ; i < pm8001_ha->max_memcnt; i++) { +struct mpi_mem *region = &pm8001_ha->memoryMap.region[i]; +if (pm8001_mem_alloc (pm8001_ha->pdev, - &pm8001_ha->memoryMap.region[i].virt_ptr, - &pm8001_ha->memoryMap.region[i].phys_addr, - &pm8001_ha->memoryMap.region[i].phys_addr_hi, - &pm8001_ha->memoryMap.region[i].phys_addr_lo, - pm8001_ha->memoryMap.region[i].total_len, - pm8001_ha->memoryMap.region[i].alignment) !=0 ) { -pm8001_dbg (pm8001_ha,FAIL , -"Mem%d alloc failed\n" , - i); - goto err_out; + ®ion->virt_ptr, + ®ion->phys_addr, + ®ion->phys_addr_hi, + ®ion->phys_addr_lo, + region->total_len, + region->alignment) !=0 ) { +pm8001_dbg (pm8001_ha,FAIL ,"Mem%d alloc failed\n" , i); + goto err_out; } } --2.26.0
Martin K. Petersen
AppliedJoe,
Quoted 1 line
Make the logging macro uses clearer and fix a whitespace defect.
Applied to 5.11/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering