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/safte.c | |
| 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/safte.c')
| -rw-r--r-- | sys/scsi/safte.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/safte.c b/sys/scsi/safte.c index ad805e7ddf9..05a95bdb061 100644 --- a/sys/scsi/safte.c +++ b/sys/scsi/safte.c @@ -1,4 +1,4 @@ -/* $OpenBSD: safte.c,v 1.65 2020/09/12 17:03:51 krw Exp $ */ +/* $OpenBSD: safte.c,v 1.66 2020/09/22 19:32:53 krw Exp $ */ /* * Copyright (c) 2005 David Gwynne <dlg@openbsd.org> @@ -249,7 +249,7 @@ safte_read_config(struct safte_softc *sc) xs->retries = 2; xs->timeout = 30000; - cmd = (struct safte_readbuf_cmd *)xs->cmd; + cmd = (struct safte_readbuf_cmd *)&xs->cmd; cmd->opcode = READ_BUFFER; SET(cmd->flags, SAFTE_RD_MODE); cmd->bufferid = SAFTE_RD_CONFIG; @@ -397,7 +397,7 @@ safte_read_encstat(void *arg) xs->retries = 2; xs->timeout = 30000; - cmd = (struct safte_readbuf_cmd *)xs->cmd; + cmd = (struct safte_readbuf_cmd *)&xs->cmd; cmd->opcode = READ_BUFFER; SET(cmd->flags, SAFTE_RD_MODE); cmd->bufferid = SAFTE_RD_ENCSTAT; @@ -581,7 +581,7 @@ safte_bio_blink(struct safte_softc *sc, struct bioc_blink *blink) xs->retries = 2; xs->timeout = 30000; - cmd = (struct safte_writebuf_cmd *)xs->cmd; + cmd = (struct safte_writebuf_cmd *)&xs->cmd; cmd->opcode = WRITE_BUFFER; SET(cmd->flags, SAFTE_WR_MODE); cmd->length = htobe16(sizeof(struct safte_slotop)); |