scsi: fas216: Stop using scsi_cmnd.scsi_done
authorBart Van Assche <bvanassche@acm.org>
Thu, 7 Oct 2021 20:28:28 +0000 (13:28 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Sun, 17 Oct 2021 01:28:46 +0000 (21:28 -0400)
Store the completion callback pointer in struct fas216_cmd_priv instead of
in struct scsi_cmnd. This patch prepares for removal of the scsi_done
member from struct scsi_cmnd.

Link: https://lore.kernel.org/r/20211007202923.2174984-34-bvanassche@acm.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/arm/fas216.c

index cf71ef4..91c03bd 100644 (file)
@@ -2015,7 +2015,7 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,
         * correctly by fas216_std_done.
         */
        scsi_eh_restore_cmnd(SCpnt, &info->ses);
-       SCpnt->scsi_done(SCpnt);
+       fas216_cmd_priv(SCpnt)->scsi_done(SCpnt);
 }
 
 /**
@@ -2086,8 +2086,8 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result)
        }
 
 done:
-       if (SCpnt->scsi_done) {
-               SCpnt->scsi_done(SCpnt);
+       if (fas216_cmd_priv(SCpnt)->scsi_done) {
+               fas216_cmd_priv(SCpnt)->scsi_done(SCpnt);
                return;
        }
 
@@ -2203,7 +2203,7 @@ static int fas216_queue_command_lck(struct scsi_cmnd *SCpnt,
        fas216_log_command(info, LOG_CONNECT, SCpnt,
                           "received command (%p)", SCpnt);
 
-       SCpnt->scsi_done = done;
+       fas216_cmd_priv(SCpnt)->scsi_done = done;
        SCpnt->host_scribble = (void *)fas216_std_done;
        SCpnt->result = 0;