summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/ic/ami.c4
-rw-r--r--sys/dev/ic/mfi.c4
-rw-r--r--sys/dev/ic/mpi.c4
-rw-r--r--sys/dev/pci/mfii.c4
-rw-r--r--sys/dev/pci/mpii.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index c2e70358c02..f1e11ac532b 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ami.c,v 1.249 2020/07/13 13:43:31 krw Exp $ */
+/* $OpenBSD: ami.c,v 1.250 2020/07/13 14:25:41 krw Exp $ */
/*
* Copyright (c) 2001 Michael Shalayeff
@@ -1552,7 +1552,7 @@ ami_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
/* u_int8_t target = link->target; */
if (sc->sc_ioctl)
- return (sc->sc_ioctl(link->adapter_softc, cmd, addr));
+ return (sc->sc_ioctl(&sc->sc_dev, cmd, addr));
else
return (ENOTTY);
}
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index 9e553a3c8fe..96b0a055675 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.180 2020/07/13 13:43:31 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.181 2020/07/13 14:25:41 krw Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
*
@@ -1416,7 +1416,7 @@ mfi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
default:
if (sc->sc_ioctl)
- return (sc->sc_ioctl(link->adapter_softc, cmd, addr));
+ return (sc->sc_ioctl(&sc->sc_dev, cmd, addr));
break;
}
diff --git a/sys/dev/ic/mpi.c b/sys/dev/ic/mpi.c
index b8b9853aeb5..e3feb00f34c 100644
--- a/sys/dev/ic/mpi.c
+++ b/sys/dev/ic/mpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpi.c,v 1.217 2020/07/13 13:43:31 krw Exp $ */
+/* $OpenBSD: mpi.c,v 1.218 2020/07/13 14:25:41 krw Exp $ */
/*
* Copyright (c) 2005, 2006, 2009 David Gwynne <dlg@openbsd.org>
@@ -2971,7 +2971,7 @@ mpi_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
default:
if (sc->sc_ioctl)
- return (sc->sc_ioctl(link->adapter_softc, cmd, addr));
+ return (sc->sc_ioctl(&sc->sc_dev, cmd, addr));
break;
}
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index 0198e77a4d9..4114fd034e0 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.75 2020/07/13 13:43:31 krw Exp $ */
+/* $OpenBSD: mfii.c,v 1.76 2020/07/13 14:25:41 krw Exp $ */
/*
* Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -2180,7 +2180,7 @@ mfii_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
default:
if (sc->sc_ioctl)
- return (sc->sc_ioctl(link->adapter_softc, cmd, addr));
+ return (sc->sc_ioctl(&sc->sc_dev, cmd, addr));
break;
}
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index df6c6cd9830..3e8f243182d 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.133 2020/07/13 13:43:31 krw Exp $ */
+/* $OpenBSD: mpii.c,v 1.134 2020/07/13 14:25:41 krw Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
* Copyright (c) 2009 James Giannoules
@@ -3210,7 +3210,7 @@ mpii_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag)
default:
if (sc->sc_ioctl)
- return (sc->sc_ioctl(link->adapter_softc, cmd, addr));
+ return (sc->sc_ioctl(&sc->sc_dev, cmd, addr));
break;
}