From 55bed41956fd54a23882af6ea9c5e9e3c20480a1 Mon Sep 17 00:00:00 2001 From: Kenneth R Westerback Date: Thu, 16 Jul 2020 21:18:32 +0000 Subject: Access adapter softc via link->bus->sb_adapter_softc. In sparc64 autoconf access 'luns' via sb_luns and 'adapter_buswidth' via sb_adapter_buswidth. Removes last post-config uses of the copies of bus related information in scsi_link. --- sys/dev/ic/siop.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/dev/ic/siop.c') diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index fbeb2bce494..84717d4520e 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.80 2020/07/13 13:43:31 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.81 2020/07/16 21:18:30 krw Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -1392,7 +1392,7 @@ siop_cmd_put(void *cookie, void *io) int siop_scsiprobe(struct scsi_link *link) { - struct siop_softc *sc = link->adapter_softc; + struct siop_softc *sc = link->bus->sb_adapter_softc; struct siop_target *siop_target; const int target = link->target; const int lun = link->lun; @@ -1458,7 +1458,7 @@ void siop_scsicmd(xs) struct scsi_xfer *xs; { - struct siop_softc *sc = xs->sc_link->adapter_softc; + struct siop_softc *sc = xs->sc_link->bus->sb_adapter_softc; struct siop_cmd *siop_cmd; struct siop_target *siop_target; int s, error, i, j; @@ -2174,7 +2174,7 @@ siop_add_dev(sc, target, lun) void siop_scsifree(struct scsi_link *link) { - struct siop_softc *sc = link->adapter_softc; + struct siop_softc *sc = link->bus->sb_adapter_softc; int target = link->target; int lun = link->lun; int i; -- cgit v1.2.3