openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-05-01 17:46:35 +00:00
Code Issues Projects Releases Wiki Activity

Remove pointless intermediate scsi_adapter field of softc by pointing

Browse Source 
sc_link.adapter at trm_switch directly.
This commit is contained in:
krw
2020-02-06 19:17:54 +00:00
parent 7a8c3d6478
commit cd3edfc434
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/ic/trm.c
View File

@@ -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;

3
sys/dev/ic/trm.h
View File

@@ -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;