Commit 609a70df authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Martin K. Petersen
Browse files

scsi: hpsa: use %phN for short hex dumps 



Passing one instead of 8 or 16 arguments reduces the size of the
generated code somewhat:

add/remove: 2/3 grow/shrink: 1/4 up/down: 1772/-2137 (-365)

There's one more candidate, unique_id_show, but that uses %02X, and I'm
not sure it would be ok to start using lowercase there, so I've left it
alone for now.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d37a0082

drivers/scsi/hpsa.c

+13 −27
Original line number Diff line number Diff line
@@ -703,9 +703,7 @@ static ssize_t lunid_show(struct device *dev, 
	}

	memcpy(lunid, hdev->scsi3addr, sizeof(lunid));

	spin_unlock_irqrestore(&h->lock, flags);

	return snprintf(buf, 20, "0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

		lunid[0], lunid[1], lunid[2], lunid[3],

		lunid[4], lunid[5], lunid[6], lunid[7]);

	return snprintf(buf, 20, "0x%8phN\n", lunid);

}



static ssize_t unique_id_show(struct device *dev,
@@ -2839,14 +2837,8 @@ static void hpsa_print_cmd(struct ctlr_info *h, char *txt, 
	const u8 *cdb = c->Request.CDB;

	const u8 *lun = c->Header.LUN.LunAddrBytes;



	dev_warn(&h->pdev->dev, "%s: LUN:%02x%02x%02x%02x%02x%02x%02x%02x"

	" CDB:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",

		txt, lun[0], lun[1], lun[2], lun[3],

		lun[4], lun[5], lun[6], lun[7],

		cdb[0], cdb[1], cdb[2], cdb[3],

		cdb[4], cdb[5], cdb[6], cdb[7],

		cdb[8], cdb[9], cdb[10], cdb[11],

		cdb[12], cdb[13], cdb[14], cdb[15]);

	dev_warn(&h->pdev->dev, "%s: LUN:%8phN CDB:%16phN\n",

		 txt, lun, cdb);

}



static void hpsa_scsi_interpret_error(struct ctlr_info *h,
@@ -6019,11 +6011,9 @@ static int hpsa_send_reset_as_abort_ioaccel2(struct ctlr_info *h, 


	if (h->raid_offload_debug > 0)

		dev_info(&h->pdev->dev,

			"scsi %d:%d:%d:%d %s scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

			"scsi %d:%d:%d:%d %s scsi3addr 0x%8phN\n",

			h->scsi_host->host_no, dev->bus, dev->target, dev->lun,

			"Reset as abort",

			scsi3addr[0], scsi3addr[1], scsi3addr[2], scsi3addr[3],

			scsi3addr[4], scsi3addr[5], scsi3addr[6], scsi3addr[7]);

			"Reset as abort", scsi3addr);



	if (!dev->offload_enabled) {

		dev_warn(&h->pdev->dev,
@@ -6040,32 +6030,28 @@ static int hpsa_send_reset_as_abort_ioaccel2(struct ctlr_info *h, 
	/* send the reset */

	if (h->raid_offload_debug > 0)

		dev_info(&h->pdev->dev,

			"Reset as abort: Resetting physical device at scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

			psa[0], psa[1], psa[2], psa[3],

			psa[4], psa[5], psa[6], psa[7]);

			"Reset as abort: Resetting physical device at scsi3addr 0x%8phN\n",

			psa);

	rc = hpsa_do_reset(h, dev, psa, HPSA_PHYS_TARGET_RESET, reply_queue);

	if (rc != 0) {

		dev_warn(&h->pdev->dev,

			"Reset as abort: Failed on physical device at scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

			psa[0], psa[1], psa[2], psa[3],

			psa[4], psa[5], psa[6], psa[7]);

			"Reset as abort: Failed on physical device at scsi3addr 0x%8phN\n",

			psa);

		return rc; /* failed to reset */

	}



	/* wait for device to recover */

	if (wait_for_device_to_become_ready(h, psa, reply_queue) != 0) {

		dev_warn(&h->pdev->dev,

			"Reset as abort: Failed: Device never recovered from reset: 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

			psa[0], psa[1], psa[2], psa[3],

			psa[4], psa[5], psa[6], psa[7]);

			"Reset as abort: Failed: Device never recovered from reset: 0x%8phN\n",

			psa);

		return -1;  /* failed to recover */

	}



	/* device recovered */

	dev_info(&h->pdev->dev,

		"Reset as abort: Device recovered from reset: scsi3addr 0x%02x%02x%02x%02x%02x%02x%02x%02x\n",

		psa[0], psa[1], psa[2], psa[3],

		psa[4], psa[5], psa[6], psa[7]);

		"Reset as abort: Device recovered from reset: scsi3addr 0x%8phN\n",

		psa);



	return rc; /* success */

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE