Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ebf2030 authored by Manoj Kumar's avatar Manoj Kumar Committed by James Bottomley
Browse files

cxlflash: Replace magic numbers with literals 



Magic numbers are not meaningful and can create confusion. As a
remedy, replace them with descriptive literals.

Replace 512 with literal MAX_SECTOR_UNIT.
Replace 5 with literal CMD_RETRIES.

Signed-off-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarManoj N. Kumar <manoj@linux.vnet.ibm.com>
Reviewed-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Reviewed-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent fa4aa632

drivers/scsi/cxlflash/superpipe.c

+4 −2
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli) 
		retry_cnt ? "re" : "", scsi_cmd[0]);



	result = scsi_execute(sdev, scsi_cmd, DMA_FROM_DEVICE, cmd_buf,

			      CMD_BUFSIZE, sense_buf, tout, 5, 0, NULL);

			      CMD_BUFSIZE, sense_buf, tout, CMD_RETRIES,

			      0, NULL);



	if (driver_byte(result) == DRIVER_SENSE) {

		result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
@@ -1375,7 +1376,8 @@ static int cxlflash_disk_attach(struct scsi_device *sdev, 
	attach->block_size = gli->blk_len;

	attach->mmio_size = sizeof(afu->afu_map->hosts[0].harea);

	attach->last_lba = gli->max_lba;

	attach->max_xfer = (sdev->host->max_sectors * 512) / gli->blk_len;

	attach->max_xfer = (sdev->host->max_sectors * MAX_SECTOR_UNIT) /

		gli->blk_len;



out:

	attach->adap_fd = fd;

drivers/scsi/cxlflash/superpipe.h

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ extern struct cxlflash_global global; 
#define MC_CHUNK_SIZE     (1 << MC_RHT_NMASK)	/* in LBAs */



#define MC_DISCOVERY_TIMEOUT 5  /* 5 secs */

#define CMD_RETRIES 5   /* 5 retries for scsi_execute */



#define MAX_SECTOR_UNIT  512 /* max_sector is in 512 byte multiples */



#define CHAN2PORT(_x)	((_x) + 1)

#define PORT2CHAN(_x)	((_x) - 1)

drivers/scsi/cxlflash/vlun.c

+2 −1
Original line number Diff line number Diff line
@@ -434,7 +434,8 @@ static int write_same16(struct scsi_device *sdev, 
				   &scsi_cmd[10]);



		result = scsi_execute(sdev, scsi_cmd, DMA_TO_DEVICE, cmd_buf,

				      CMD_BUFSIZE, sense_buf, tout, 5, 0, NULL);

				      CMD_BUFSIZE, sense_buf, tout, CMD_RETRIES,

				      0, NULL);

		if (result) {

			dev_err_ratelimited(dev, "%s: command failed for "

					    "offset %lld result=0x%x\n",