git: 0b90164992a8 - stable/13 - nvme: Make nvme_ctrlr_hw_reset static

Warner Losh imp at FreeBSD.org
Wed Feb 24 18:13:01 UTC 2021


The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=0b90164992a871052da5f1b72105c6d42ded2172

commit 0b90164992a871052da5f1b72105c6d42ded2172
Author:     Warner Losh <imp at FreeBSD.org>
AuthorDate: 2021-02-08 20:28:18 +0000
Commit:     Warner Losh <imp at FreeBSD.org>
CommitDate: 2021-02-24 18:10:51 +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 c0e6c408ab56..351c6839a6f6 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -403,7 +403,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 6c1d293f047d..ee0a909e24ec 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -398,7 +398,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-all mailing list