scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro

This makes it easier to find users of the NCR5380_cmd data structure with
'grep'.

Link: https://lore.kernel.org/r/20220218195117.25689-8-bvanassche@acm.org
Cc: Finn Thain <fthain@telegraphics.com.au>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Ondrej Zary <linux@rainbow-software.org>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Finn Thain <fthain@linux-m68k.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h
index 8a3b41932288eb7ceb6151be1a3b7e0a7d2e2cd4..845bd2423e669c3e200a6a6ee13f0225a0f2054f 100644 (file)
--- a/drivers/scsi/NCR5380.h
+++ b/drivers/scsi/NCR5380.h
@@ -230,8 +230,6 @@ struct NCR5380_cmd {
        struct list_head list;
 };
 
-#define NCR5380_CMD_SIZE               (sizeof(struct NCR5380_cmd))
-
 #define NCR5380_PIO_CHUNK_SIZE         256
 
 /* Time limit (ms) to poll registers when IRQs are disabled, e.g. during PDMA */

diff --git a/drivers/scsi/arm/cumana_1.c b/drivers/scsi/arm/cumana_1.c
index 3fd9443746315dffc6cc7a926d501d66ce79f10d..5d4f67ba74c0d88b7c5d8aadab5fb12c2e2c1256 100644 (file)
--- a/drivers/scsi/arm/cumana_1.c
+++ b/drivers/scsi/arm/cumana_1.c
@@ -223,7 +223,7 @@ static struct scsi_host_template cumanascsi_template = {
        .sg_tablesize           = SG_ALL,
        .cmd_per_lun            = 2,
        .proc_name              = "CumanaSCSI-1",
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
        .max_sectors            = 128,
        .dma_boundary           = PAGE_SIZE - 1,
 };

diff --git a/drivers/scsi/arm/oak.c b/drivers/scsi/arm/oak.c
index 78f33d57c3e8d9849a1828f3bb3fe0ee51361370..f18a0620c80872a49fb12ec717f900d9293670ab 100644 (file)
--- a/drivers/scsi/arm/oak.c
+++ b/drivers/scsi/arm/oak.c
@@ -113,7 +113,7 @@ static struct scsi_host_template oakscsi_template = {
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
        .proc_name              = "oakscsi",
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
        .max_sectors            = 128,
 };
 

diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c
index 95d7a35860836119ceb2144d7dd34feb74f39de3..e9d0d99abc86476a5bbe3bedb1ef0953e13ae8a5 100644 (file)
--- a/drivers/scsi/atari_scsi.c
+++ b/drivers/scsi/atari_scsi.c
@@ -711,7 +711,7 @@ static struct scsi_host_template atari_scsi_template = {
        .this_id                = 7,
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
 };
 
 static int __init atari_scsi_probe(struct platform_device *pdev)

diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index 6df60b31ecb0d62f66d0d11b9c2e9ec808cc3316..a171ce6b70b2c92175032c8b90c0e5ee75034fa8 100644 (file)
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -52,7 +52,7 @@ static struct scsi_host_template dmx3191d_driver_template = {
        .sg_tablesize           = SG_ALL,
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
 };
 
 static int dmx3191d_probe_one(struct pci_dev *pdev,

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 7ba3c9312731dab438cfd83c89b9bae124778154..5923f86a384e3e8bbbeadae05c2f3453795c39fd 100644 (file)
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -702,7 +702,7 @@ static struct scsi_host_template driver_template = {
        .sg_tablesize           = SG_ALL,
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
        .max_sectors            = 128,
 };
 

diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c
index 5c808fbc6ce2c8f7c4872b8beeeb818b3ab5bfd1..71d493a0bb43cb004276818bd6de48928b84598d 100644 (file)
--- a/drivers/scsi/mac_scsi.c
+++ b/drivers/scsi/mac_scsi.c
@@ -434,7 +434,7 @@ static struct scsi_host_template mac_scsi_template = {
        .sg_tablesize           = 1,
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
        .max_sectors            = 128,
 };
 

diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index f7f724a3ff1d448c2d8e297b61a684fc43ef8dea..82a253270c3b9d3a9e93e3e69eb14cdb19b24a59 100644 (file)
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -505,7 +505,7 @@ static struct scsi_host_template sun3_scsi_template = {
        .sg_tablesize           = 1,
        .cmd_per_lun            = 2,
        .dma_boundary           = PAGE_SIZE - 1,
-       .cmd_size               = NCR5380_CMD_SIZE,
+       .cmd_size               = sizeof(struct NCR5380_cmd),
 };
 
 static int __init sun3_scsi_probe(struct platform_device *pdev)