diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-13 14:25:42 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-07-13 14:25:42 +0000 |
| commit | 4aa411c38c3f3878e03ec89da9e8a636ab44fde3 (patch) | |
| tree | a33eefc39421296d79b488857af8bd37baef374b /sys/dev/ic | |
| parent | 12d1de709c4952fd510cd76291aa62812d30e887 (diff) | |
Where we have a pointer (sc) to the relevant adapter_softc, use
&sc->sc_dev to get a device pointer rather than using the void *
whence we obtained 'sc'.
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/ami.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/mfi.c | 4 | ||||
| -rw-r--r-- | sys/dev/ic/mpi.c | 4 |
3 files changed, 6 insertions, 6 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; } |