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/dev/ic/aic6360.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/dev/ic/aic6360.c')
| -rw-r--r-- | sys/dev/ic/aic6360.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c index ed9ace02286..25c59d2b491 100644 --- a/sys/dev/ic/aic6360.c +++ b/sys/dev/ic/aic6360.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360.c,v 1.37 2020/07/20 14:41:13 krw Exp $ */ +/* $OpenBSD: aic6360.c,v 1.38 2020/09/22 19:32:52 krw Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ #ifdef DDB @@ -483,7 +483,7 @@ aic_scsi_cmd(struct scsi_xfer *xs) int s, flags; AIC_TRACE(("aic_scsi_cmd ")); - AIC_CMDS(("[0x%x, %d]->%d ", (int)xs->cmd->opcode, xs->cmdlen, + AIC_CMDS(("[0x%x, %d]->%d ", (int)xs->cmd.opcode, xs->cmdlen, sc_link->target)); flags = xs->flags; @@ -499,7 +499,7 @@ aic_scsi_cmd(struct scsi_xfer *xs) acb->scsi_cmd_length = 0; acb->data_length = 0; } else { - bcopy(xs->cmd, &acb->scsi_cmd, xs->cmdlen); + bcopy(&xs->cmd, &acb->scsi_cmd, xs->cmdlen); acb->scsi_cmd_length = xs->cmdlen; acb->data_addr = xs->data; acb->data_length = xs->datalen; |