pm80xx : Removing redundant code snippets
Subsystems (2)
PATCH 5/6 pm80xx : Removing redundant code snippets
Removed redundant code snipptes in pm8001_hwi.c
and pm8001_ctl.c
Signed-off-by Viswas G <[email protected]>
--- drivers/scsi/pm8001/pm8001_ctl.c | 22 ++++++++-------------- drivers/scsi/pm8001/pm8001_hwi.c | 7 +------ 2 files changed, 9 insertions(+), 20 deletions(-)
drivers/scsi/pm8001/pm8001_ctl.c +8 -14
@@ -323,16 +323,13 @@ static ssize_t pm8001_ctl_ib_queue_log_show(struct device *cdev,int offset;char *str = buf;int start =0 ; -#define IB_MEMMAP (c) \ - (*(u32 *)((u8 *)pm8001_ha-> \ - memoryMap.region[IB].virt_ptr + \ +#define IB_MEMMAP (c) \ + (*(u32 *)((u8 *)pm8001_ha-> \ + memoryMap.region[IB].virt_ptr + \ pm8001_ha->evtlog_ib_offset + (c)))for (offset =0 ; offset <IB_OB_READ_TIMES ; offset++) { -if (pm8001_ha->chip_id != chip_8001) - str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); -else - str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); + str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); start = start +4 ; } pm8001_ha->evtlog_ib_offset +=SYSFS_OFFSET ;
@@ -363,16 +360,13 @@ static ssize_t pm8001_ctl_ob_queue_log_show(struct device *cdev,int offset;char *str = buf;int start =0 ; -#define OB_MEMMAP (c) \ - (*(u32 *)((u8 *)pm8001_ha-> \ - memoryMap.region[OB].virt_ptr + \ +#define OB_MEMMAP (c) \ + (*(u32 *)((u8 *)pm8001_ha-> \ + memoryMap.region[OB].virt_ptr + \ pm8001_ha->evtlog_ob_offset + (c)))for (offset =0 ; offset <IB_OB_READ_TIMES ; offset++) { -if (pm8001_ha->chip_id != chip_8001) - str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); -else - str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); + str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); start = start +4 ; } pm8001_ha->evtlog_ob_offset +=SYSFS_OFFSET ;
drivers/scsi/pm8001/pm8001_hwi.c +1 -6
@@ -5072,13 +5072,8 @@ pm8001_get_gsm_dump(struct device *cdev, u32 length, char* buf) direct_data +=sprintf (direct_data,"%08x " , value); }/* Shift back to BAR4 original address */ -if (pm8001_ha->chip_id == chip_8001) { -if (-1 ==pm8001_bar4_shift (pm8001_ha,0 )) +if (-1 ==pm8001_bar4_shift (pm8001_ha,0 ))return 1 ; - }else { -if (-1 ==pm80xx_bar4_shift (pm8001_ha,0 )) -return 1 ; - } pm8001_ha->fatal_forensic_shift_offset +=1024 ;if (pm8001_ha->fatal_forensic_shift_offset >=0x100000 )
Signature · 1 line
1.7.1
Quoted 4 lines · Viswas G
Removed redundant code snipptes in
pm8001_hwi.c
andpm8001_ctl.cSigned-off-by Viswas G <[email protected]>
Looks good, thanks
Reviewed-by Jack Wang <[email protected]>
Quoted 71 lines
--- drivers/scsi/pm8001/pm8001_ctl.c | 22 ++++++++-------------- drivers/scsi/pm8001/pm8001_hwi.c | 7 +------ 2 files changed, 9 insertions(+), 20 deletions(-)drivers/scsi/pm8001/pm8001_ctl.c +8
-14@@ -323,16 +323,13 @@ static ssize_t pm8001_ctl_ib_queue_log_show(struct device *cdev,int offset;char *str = buf;int start =0 ; -#define IB_MEMMAP (c) \ - (*(u32 *)((u8 *)pm8001_ha-> \ - memoryMap.region[IB].virt_ptr + \ +#define IB_MEMMAP (c) \ + (*(u32 *)((u8 *)pm8001_ha-> \ + memoryMap.region[IB].virt_ptr + \ pm8001_ha->evtlog_ib_offset + (c)))for (offset =0 ; offset <IB_OB_READ_TIMES ; offset++) { -if (pm8001_ha->chip_id != chip_8001) - str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); -else - str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); + str +=sprintf (str,"0x%08x\n" ,IB_MEMMAP (start)); start = start +4 ; } pm8001_ha->evtlog_ib_offset +=SYSFS_OFFSET ;@@ -363,16 +360,13 @@ static ssize_t pm8001_ctl_ob_queue_log_show(struct device *cdev,int offset;char *str = buf;int start =0 ; -#define OB_MEMMAP (c) \ - (*(u32 *)((u8 *)pm8001_ha-> \ - memoryMap.region[OB].virt_ptr + \ +#define OB_MEMMAP (c) \ + (*(u32 *)((u8 *)pm8001_ha-> \ + memoryMap.region[OB].virt_ptr + \ pm8001_ha->evtlog_ob_offset + (c)))for (offset =0 ; offset <IB_OB_READ_TIMES ; offset++) { -if (pm8001_ha->chip_id != chip_8001) - str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); -else - str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); + str +=sprintf (str,"0x%08x\n" ,OB_MEMMAP (start)); start = start +4 ; } pm8001_ha->evtlog_ob_offset +=SYSFS_OFFSET ;drivers/scsi/pm8001/pm8001_hwi.c +1
-6@@ -5072,13 +5072,8 @@ pm8001_get_gsm_dump(struct device *cdev, u32 length, char* buf) direct_data +=sprintf (direct_data,"%08x " , value); }/* Shift back to BAR4 original address */ -if (pm8001_ha->chip_id == chip_8001) { -if (-1 ==pm8001_bar4_shift (pm8001_ha,0 )) +if (-1 ==pm8001_bar4_shift (pm8001_ha,0 ))return 1 ; - }else { -if (-1 ==pm80xx_bar4_shift (pm8001_ha,0 )) -return 1 ; - } pm8001_ha->fatal_forensic_shift_offset +=1024 ;if (pm8001_ha->fatal_forensic_shift_offset >=0x100000 )