diff options
| author |   krw <krw@openbsd.org> | 2020-02-28 21:12:26 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-02-28 21:12:26 +0000 |
| commit | ee8b2d53deb2bb0800aee4c4f420fe154f81b0dc (patch) | |
| tree | ff2e93edb6426bea0b428b74e943721d73f79288 | |
| parent | Revert previous, diff contains an obvious bug. (diff) | |
nvme_enable() doesn't need parameters for both sc and sc->sc_mps_bits.
Nuke the latter and use the former to get the same value.
| -rw-r--r-- | sys/dev/ic/nvme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c index 33a9f01fe96..3020b56609b 100644 --- a/sys/dev/ic/nvme.c +++ b/sys/dev/ic/nvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme.c,v 1.67 2020/02/27 18:37:19 krw Exp $ */ +/* $OpenBSD: nvme.c,v 1.68 2020/02/28 21:12:26 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -44,7 +44,7 @@ struct cfdriver nvme_cd = { }; int nvme_ready(struct nvme_softc *, u_int32_t); -int nvme_enable(struct nvme_softc *, u_int); +int nvme_enable(struct nvme_softc *); int nvme_disable(struct nvme_softc *); int nvme_shutdown(struct nvme_softc *); int nvme_resume(struct nvme_softc *); @@ -212,7 +212,7 @@ nvme_ready(struct nvme_softc *sc, u_int32_t rdy) } int -nvme_enable(struct nvme_softc *sc, u_int mps) +nvme_enable(struct nvme_softc *sc) { u_int32_t cc; @@ -235,7 +235,7 @@ nvme_enable(struct nvme_softc *sc, u_int mps) SET(cc, NVME_CC_SHN(NVME_CC_SHN_NONE)); SET(cc, NVME_CC_CSS(NVME_CC_CSS_NVM)); SET(cc, NVME_CC_AMS(NVME_CC_AMS_RR)); - SET(cc, NVME_CC_MPS(mps)); + SET(cc, NVME_CC_MPS(sc->sc_mps_bits)); SET(cc, NVME_CC_EN); nvme_write4(sc, NVME_CC, cc); @@ -322,7 +322,7 @@ nvme_attach(struct nvme_softc *sc) } nccbs = 16; - if (nvme_enable(sc, mps) != 0) { + if (nvme_enable(sc) != 0) { printf("%s: unable to enable controller\n", DEVNAME(sc)); goto free_ccbs; } @@ -405,7 +405,7 @@ nvme_resume(struct nvme_softc *sc) return (1); } - if (nvme_enable(sc, sc->sc_mps_bits) != 0) { + if (nvme_enable(sc) != 0) { printf("%s: unable to enable controller\n", DEVNAME(sc)); return (1); } |