diff options
| author |   krw <krw@openbsd.org> | 2020-03-10 14:49:20 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2020-03-10 14:49:20 +0000 |
| commit | ba7a2093867594fcfa2aea533335c3699f97aa19 (patch) | |
| tree | 05bc7179954553680c82c79b300317346cbfbadb | |
| parent | Narrow the visibility of some functions and variables local to output.c (diff) | |
| download | wireguard-openbsd-ba7a2093867594fcfa2aea533335c3699f97aa19.tar.xz wireguard-openbsd-ba7a2093867594fcfa2aea533335c3699f97aa19.zip | |
Coverity points out (12 + MAXMPS) can never be less than
12. PAGE_SHIFT is 12 (a.k.a. PAGE_SIZE == 4096) or more on OpenBSD
architectures. So remove some dead code by unconditionally setting
sc_mps (memory page size) to 1 << PAGE_SHIFT.
CID 1491655.
No functional change.
| -rw-r--r-- | sys/dev/ic/nvme.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/dev/ic/nvme.c b/sys/dev/ic/nvme.c index c9c6a93fcd4..b08f1d17141 100644 --- a/sys/dev/ic/nvme.c +++ b/sys/dev/ic/nvme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nvme.c,v 1.71 2020/03/10 13:50:13 krw Exp $ */ +/* $OpenBSD: nvme.c,v 1.72 2020/03/10 14:49:20 krw Exp $ */ /* * Copyright (c) 2014 David Gwynne <dlg@openbsd.org> @@ -296,11 +296,8 @@ nvme_attach(struct nvme_softc *sc) 1 << NVME_CAP_MPSMIN(cap), 1 << PAGE_SHIFT); return (1); } - if (NVME_CAP_MPSMAX(cap) < PAGE_SHIFT) - sc->sc_mps = 1 << NVME_CAP_MPSMAX(cap); - else - sc->sc_mps = 1 << PAGE_SHIFT; + sc->sc_mps = 1 << PAGE_SHIFT; /* mps == memory page size */ sc->sc_rdy_to = NVME_CAP_TO(cap); sc->sc_mdts = MAXPHYS; sc->sc_max_prpl = sc->sc_mdts / sc->sc_mps; |