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: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Manoj N. Kumar <manoj@linux.vnet.ibm.com>
Reviewed-by: Brian King <brking@linux.vnet.ibm.com>
Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
index f1b62cea75b168ec1c89a255f1d393b5ae113386..7df985d7830c3df6e67e81f635dfd75db41decc1 100644 (file)
--- a/drivers/scsi/cxlflash/superpipe.c
+++ b/drivers/scsi/cxlflash/superpipe.c
@@ -315,7 +315,8 @@ retry:
                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 @@ out_attach:
        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;

diff --git a/drivers/scsi/cxlflash/superpipe.h b/drivers/scsi/cxlflash/superpipe.h
index d7dc88bc64a4b805b973d58df8430f86665710b3..3f7856b6642793f12d799372e46a39f25b0d5a27 100644 (file)
--- a/drivers/scsi/cxlflash/superpipe.h
+++ b/drivers/scsi/cxlflash/superpipe.h
@@ -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)

diff --git a/drivers/scsi/cxlflash/vlun.c b/drivers/scsi/cxlflash/vlun.c
index 6155cb1d4ed37ead707baa2e95000be03a608a3b..6d6608bb4bb0880d55183fcd18452e0dfb601a67 100644 (file)
--- a/drivers/scsi/cxlflash/vlun.c
+++ b/drivers/scsi/cxlflash/vlun.c
@@ -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",