diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-09-22 19:32:54 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-09-22 19:32:54 +0000 |
| commit | 70ab233e8ea36a5247134fe44b69a8dfdf402407 (patch) | |
| tree | 483c199290faf16a870f66921c5bd6d7ab5353dd /sys/scsi/scsiconf.h | |
| parent | d527f54e9b61003b890a6173328b1286c7c52ed7 (diff) | |
Since dlg@'s 2009 scsi midlayer refactoring the 'struct scsi_generic *cmd'
member of 'struct scsi_xfer' has always been pointed at the 'struct scsi_generic
cmdstore' member of the same instance. So nuke 'cmdstore' and remove the '*'
from cmd. Take the address of cmd as required by the various casts.
No intentional functional change.
luna88k test by aoyama@, sparc64 test by jmatthew@
Identification of 2009's last *cmd use and ok jmatthew@
Diffstat (limited to 'sys/scsi/scsiconf.h')
| -rw-r--r-- | sys/scsi/scsiconf.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h index 6bd568e9df3..9c7488531f1 100644 --- a/sys/scsi/scsiconf.h +++ b/sys/scsi/scsiconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.h,v 1.198 2020/08/30 19:41:25 krw Exp $ */ +/* $OpenBSD: scsiconf.h,v 1.199 2020/09/22 19:32:53 krw Exp $ */ /* $NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $ */ /* @@ -393,7 +393,7 @@ struct scsi_xfer { struct scsi_link *sc_link; /* all about our device and adapter */ int retries; /* the number of times to retry */ int timeout; /* in milliseconds */ - struct scsi_generic *cmd; /* The scsi command to execute */ + struct scsi_generic cmd; /* The scsi command to execute */ int cmdlen; /* how long it is */ u_char *data; /* dma address OR a uio address */ int datalen; /* data len (blank if uio) */ @@ -402,7 +402,6 @@ struct scsi_xfer { struct buf *bp; /* If we need to associate with a buf */ struct scsi_sense_data sense; /* 18 bytes*/ u_int8_t status; /* SCSI status */ - struct scsi_generic cmdstore; /* stash the command in here */ /* * timeout structure for hba's to use for a command */ |