diff options
| author |   krw <krw@openbsd.org> | 2020-07-11 20:06:04 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-07-11 20:06:04 +0000 |
| commit | cf99f1d0d3e3425873297bf7369a10923824963b (patch) | |
| tree | 52404da810bc5df612b6a39923d29328875853aa | |
| parent | Cache a pointer to the scsibus_softc rather than hoping the copy in (diff) | |
| download | wireguard-openbsd-cf99f1d0d3e3425873297bf7369a10923824963b.tar.xz wireguard-openbsd-cf99f1d0d3e3425873297bf7369a10923824963b.zip | |
Garbage collect unused nvme_softc member "sc_scsibus".
| -rw-r--r-- | sys/dev/ic/nvme.c | 5 | ||||
| -rw-r--r-- | sys/dev/ic/nvmevar.h | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c index 3f18cb2037a..5933131d13f 100644 --- a/sys/dev/ic/nvme.c +++ b/sys/dev/ic/nvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme.c,v 1.77 2020/06/29 15:01:58 krw Exp $ */ +/* $OpenBSD: nvme.c,v 1.78 2020/07/11 20:06:04 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -373,8 +373,7 @@ nvme_attach(struct nvme_softc *sc) saa.saa_sc_link = &sc->sc_link; - sc->sc_scsibus = (struct scsibus_softc *)config_found(&sc->sc_dev, - &saa, scsiprint); + config_found(&sc->sc_dev, &saa, scsiprint); return (0); diff --git a/sys/dev/ic/nvmevar.h b/sys/dev/ic/nvmevar.h index fd1691d3664..08da0f7dbc3 100644 --- a/sys/dev/ic/nvmevar.h +++ b/sys/dev/ic/nvmevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nvmevar.h,v 1.16 2020/03/15 20:50:46 krw Exp $ */ +/* $OpenBSD: nvmevar.h,v 1.17 2020/07/11 20:06:04 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -102,7 +102,6 @@ struct nvme_softc { struct scsi_iopool sc_iopool; struct scsi_link sc_link; - struct scsibus_softc *sc_scsibus; }; int nvme_attach(struct nvme_softc *); |