git: d0f91d7de3f9 - stable/12 - nvme: Make nvme_ctrlr_hw_reset static
Warner Losh
imp at FreeBSD.org
Sat Jul 31 00:21:35 UTC 2021
The branch stable/12 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=d0f91d7de3f97259fc86bf615da5cf9357a3d066
commit d0f91d7de3f97259fc86bf615da5cf9357a3d066
Author: Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-02-08 20:28:18 +0000
Commit: Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-07-31 00:02:53 +0000
nvme: Make nvme_ctrlr_hw_reset static
nvme_ctrlr_hw_reset is no longer used outside of nvme_ctrlr.c, so
make it static. If we need to change this in the future we can.
(cherry picked from commit dd2516fc078f15633ad5aedaad6de140cb491f80)
---
sys/dev/nvme/nvme_ctrlr.c | 2 +-
sys/dev/nvme/nvme_private.h | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 2bc0e1081d2b..d4d472878b82 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -402,7 +402,7 @@ nvme_ctrlr_disable_qpairs(struct nvme_controller *ctrlr)
}
}
-int
+static int
nvme_ctrlr_hw_reset(struct nvme_controller *ctrlr)
{
int err;
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index f26afbe29542..001d45f2acc4 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -405,7 +405,6 @@ void nvme_completion_poll_cb(void *arg, const struct nvme_completion *cpl);
int nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev);
void nvme_ctrlr_destruct(struct nvme_controller *ctrlr, device_t dev);
void nvme_ctrlr_shutdown(struct nvme_controller *ctrlr);
-int nvme_ctrlr_hw_reset(struct nvme_controller *ctrlr);
void nvme_ctrlr_reset(struct nvme_controller *ctrlr);
/* ctrlr defined as void * to allow use with config_intrhook. */
void nvme_ctrlr_start_config_hook(void *ctrlr_arg);
More information about the dev-commits-src-branches
mailing list