scsi: fas216: Introduce struct fas216_cmd_priv

Introduce a structure with driver-private data per SCSI command. This data
structure will be used by the next patch to store a function pointer.

Link: https://lore.kernel.org/r/20211007202923.2174984-33-bvanassche@acm.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/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index 5914141207542d538cf968ce18953d7682ebc337..7f667c198f6d235a1dad61d58cf598e92a7e5b2d 100644 (file)
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -243,6 +243,7 @@ static struct scsi_host_template arxescsi_template = {
        .eh_bus_reset_handler           = fas216_eh_bus_reset,
        .eh_device_reset_handler        = fas216_eh_device_reset,
        .eh_abort_handler               = fas216_eh_abort,
+       .cmd_size                       = sizeof(struct fas216_cmd_priv),
        .can_queue                      = 0,
        .this_id                        = 7,
        .sg_tablesize                   = SG_ALL,

diff --git a/drivers/scsi/arm/cumana_2.c b/drivers/scsi/arm/cumana_2.c
index 9dcd912267e62fbeb4c90f054da552eeb89b3e4d..3c00d77738765d6aaae1e10ef9a83f237c3727e0 100644 (file)
--- a/drivers/scsi/arm/cumana_2.c
+++ b/drivers/scsi/arm/cumana_2.c
@@ -363,6 +363,7 @@ static struct scsi_host_template cumanascsi2_template = {
        .eh_bus_reset_handler           = fas216_eh_bus_reset,
        .eh_device_reset_handler        = fas216_eh_device_reset,
        .eh_abort_handler               = fas216_eh_abort,
+       .cmd_size                       = sizeof(struct fas216_cmd_priv),
        .can_queue                      = 1,
        .this_id                        = 7,
        .sg_tablesize                   = SG_MAX_SEGMENTS,

diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 5eb2415dda9dcdda55fd7147d74b758bef0957d4..1394590eecead5ae4072e32776d39af4a36d0f1a 100644 (file)
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -480,6 +480,7 @@ static struct scsi_host_template eesox_template = {
        .eh_bus_reset_handler           = fas216_eh_bus_reset,
        .eh_device_reset_handler        = fas216_eh_device_reset,
        .eh_abort_handler               = fas216_eh_abort,
+       .cmd_size                       = sizeof(struct fas216_cmd_priv),
        .can_queue                      = 1,
        .this_id                        = 7,
        .sg_tablesize                   = SG_MAX_SEGMENTS,

diff --git a/drivers/scsi/arm/fas216.h b/drivers/scsi/arm/fas216.h
index 847413ce14cf68a1dda048e0dd2b7c3a8c78f985..abf960487314469fe23646d5b56d314c4774e78c 100644 (file)
--- a/drivers/scsi/arm/fas216.h
+++ b/drivers/scsi/arm/fas216.h
@@ -310,6 +310,16 @@ typedef struct {
        unsigned long           magic_end;
 } FAS216_Info;
 
+/* driver-private data per SCSI command. */
+struct fas216_cmd_priv {
+       void (*scsi_done)(struct scsi_cmnd *cmd);
+};
+
+static inline struct fas216_cmd_priv *fas216_cmd_priv(struct scsi_cmnd *cmd)
+{
+       return scsi_cmd_priv(cmd);
+}
+
 /* Function: int fas216_init (struct Scsi_Host *instance)
  * Purpose : initialise FAS/NCR/AMD SCSI structures.
  * Params  : instance - a driver-specific filled-out structure

diff --git a/drivers/scsi/arm/powertec.c b/drivers/scsi/arm/powertec.c
index 9cc73da4e876e1378c4aae70cec4a0bd6228e3c2..8fec435cee18d4ee3406b488c4f734457ad191ac 100644 (file)
--- a/drivers/scsi/arm/powertec.c
+++ b/drivers/scsi/arm/powertec.c
@@ -286,7 +286,7 @@ static struct scsi_host_template powertecscsi_template = {
        .eh_bus_reset_handler           = fas216_eh_bus_reset,
        .eh_device_reset_handler        = fas216_eh_device_reset,
        .eh_abort_handler               = fas216_eh_abort,
-
+       .cmd_size                       = sizeof(struct fas216_cmd_priv),
        .can_queue                      = 8,
        .this_id                        = 7,
        .sg_tablesize                   = SG_MAX_SEGMENTS,