Commit 859b5d10 authored by Viswas G's avatar Viswas G Committed by James Bottomley
Browse files

[SCSI] pm80xx: Removing redundant code snippets 



Removed redundant code snippets in pm8001_hwi.c and
pm8001_ctl.c

Signed-off-by: default avatarViswas G <Viswas.G@pmcs.com>
Reviewed-by: default avatarJack Wang <jinpu.wang@profitbricks.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b12bb60d

drivers/scsi/pm8001/pm8001_ctl.c

+10 −24
Original line number Diff line number Diff line
@@ -329,18 +329,11 @@ static ssize_t pm8001_ctl_ib_queue_log_show(struct device *cdev, 
		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));

		start = start + 4;

	}

	pm8001_ha->evtlog_ib_offset += SYSFS_OFFSET;

	if ((((pm8001_ha->evtlog_ib_offset) % (PM80XX_IB_OB_QUEUE_SIZE)) == 0)

		&& (pm8001_ha->chip_id != chip_8001))

		pm8001_ha->evtlog_ib_offset = 0;

	if ((((pm8001_ha->evtlog_ib_offset) % (PM8001_IB_OB_QUEUE_SIZE)) == 0)

		&& (pm8001_ha->chip_id == chip_8001))

	if (((pm8001_ha->evtlog_ib_offset) % (PM80XX_IB_OB_QUEUE_SIZE)) == 0)

		pm8001_ha->evtlog_ib_offset = 0;



	return str - buf;
@@ -369,18 +362,11 @@ static ssize_t pm8001_ctl_ob_queue_log_show(struct device *cdev, 
		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));

		start = start + 4;

	}

	pm8001_ha->evtlog_ob_offset += SYSFS_OFFSET;

	if ((((pm8001_ha->evtlog_ob_offset) % (PM80XX_IB_OB_QUEUE_SIZE)) == 0)

			&& (pm8001_ha->chip_id != chip_8001))

		pm8001_ha->evtlog_ob_offset = 0;

	if ((((pm8001_ha->evtlog_ob_offset) % (PM8001_IB_OB_QUEUE_SIZE)) == 0)

			&& (pm8001_ha->chip_id == chip_8001))

	if (((pm8001_ha->evtlog_ob_offset) % (PM80XX_IB_OB_QUEUE_SIZE)) == 0)

		pm8001_ha->evtlog_ob_offset = 0;



	return str - buf;

drivers/scsi/pm8001/pm8001_hwi.c

+1 −6
Original line number Diff line number Diff line
@@ -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))

			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)