summaryrefslogtreecommitdiff
path: root/sys/dev/isa
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-09-22 19:32:54 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-09-22 19:32:54 +0000
commit70ab233e8ea36a5247134fe44b69a8dfdf402407 (patch)
tree483c199290faf16a870f66921c5bd6d7ab5353dd /sys/dev/isa
parentd527f54e9b61003b890a6173328b1286c7c52ed7 (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/isa')
-rw-r--r--sys/dev/isa/wds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index d90f63fb18e..34d98044b9a 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.56 2020/07/29 12:13:05 krw Exp $ */
+/* $OpenBSD: wds.c,v 1.57 2020/09/22 19:32:53 krw Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -893,7 +893,7 @@ wds_scsi_cmd(struct scsi_xfer *xs)
/* Zero out the command structure. */
bzero(&scb->cmd, sizeof scb->cmd);
- bcopy(xs->cmd, &scb->cmd.scb, xs->cmdlen < 12 ? xs->cmdlen : 12);
+ bcopy(&xs->cmd, &scb->cmd.scb, xs->cmdlen < 12 ? xs->cmdlen : 12);
/* Set up some of the command fields. */
scb->cmd.targ = (xs->sc_link->target << 5) | xs->sc_link->lun;