diff options
| author |   krw <krw@openbsd.org> | 2020-02-06 19:17:54 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-02-06 19:17:54 +0000 |
| commit | cd3edfc43489c2fba2bec24b32a33b16e4f6ab53 (patch) | |
| tree | f8152441e47c3c793d631b8bf0d9bcda100ae92d | |
| parent | Delete unused scsi_adapter fields of softc's. (diff) | |
| download | wireguard-openbsd-cd3edfc43489c2fba2bec24b32a33b16e4f6ab53.tar.xz wireguard-openbsd-cd3edfc43489c2fba2bec24b32a33b16e4f6ab53.zip | |
Remove pointless intermediate scsi_adapter field of softc by pointing
sc_link.adapter at trm_switch directly.
| -rw-r--r-- | sys/dev/ic/trm.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/trm.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/ic/trm.c b/sys/dev/ic/trm.c index e1c342d2779..dfccb55f07d 100644 --- a/sys/dev/ic/trm.c +++ b/sys/dev/ic/trm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.c,v 1.37 2020/02/06 15:56:36 krw Exp $ +/* $OpenBSD: trm.c,v 1.38 2020/02/06 19:17:54 krw Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.c @@ -2429,13 +2429,10 @@ trm_initACB(struct trm_softc *sc, int unit) } } - sc->sc_adapter.scsi_cmd = trm_scsi_cmd; - sc->sc_adapter.dev_minphys = trm_minphys; - sc->sc_link.adapter_softc = sc; sc->sc_link.adapter_target = sc->sc_AdaptSCSIID; sc->sc_link.openings = 30; /* So TagMask (32 bit integer) always has space */ - sc->sc_link.adapter = &sc->sc_adapter; + sc->sc_link.adapter = &trm_switch; sc->sc_link.adapter_buswidth = ((sc->sc_config & HCC_WIDE_CARD) == 0) ? 8:16; sc->sc_link.pool = &sc->sc_iopool; diff --git a/sys/dev/ic/trm.h b/sys/dev/ic/trm.h index e0c03b6b372..8b0317b3f91 100644 --- a/sys/dev/ic/trm.h +++ b/sys/dev/ic/trm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: trm.h,v 1.4 2020/02/06 15:34:29 krw Exp $ +/* $OpenBSD: trm.h,v 1.5 2020/02/06 19:17:54 krw Exp $ * ------------------------------------------------------------ * O.S : OpenBSD * File Name : trm.h @@ -215,7 +215,6 @@ struct trm_softc * Link to the generic SCSI driver *---------------------------------- */ - struct scsi_adapter sc_adapter; struct scsi_link sc_link; struct SRB_HEAD freeSRB; |