The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=4e3beef84628ce6dfea7f053cddf3289fddf7794
commit 4e3beef84628ce6dfea7f053cddf3289fddf7794 Author: Matt Delco <[email protected]> AuthorDate: 2026-03-10 19:30:51 +0000 Commit: Alexander Ziaee <[email protected]> CommitDate: 2026-03-16 17:37:46 +0000 nvme: Removed unused 'regs' variable The private struct has a 'regs' member that's only written to and otherwise unused. This change removes it. Fixes: b3d9e5013f3e5 (Don't active memory space) Requested by: jhb Reviewed by: imp, jhb, jrtc27 Differential Revision: https://reviews.freebsd.org/D55817 --- sys/dev/nvme/nvme_ahci.c | 1 - sys/dev/nvme/nvme_pci.c | 1 - sys/dev/nvme/nvme_private.h | 2 -- 3 files changed, 4 deletions(-) diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c index c50971f83975..8b3b6855bb62 100644 --- a/sys/dev/nvme/nvme_ahci.c +++ b/sys/dev/nvme/nvme_ahci.c @@ -79,7 +79,6 @@ nvme_ahci_attach(device_t dev) } ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; /* Allocate and setup IRQ */ ctrlr->rid = 0; diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c index 74191df52058..fa5a88844f92 100644 --- a/sys/dev/nvme/nvme_pci.c +++ b/sys/dev/nvme/nvme_pci.c @@ -225,7 +225,6 @@ nvme_ctrlr_allocate_bar(struct nvme_controller *ctrlr) ctrlr->bus_tag = rman_get_bustag(ctrlr->resource); ctrlr->bus_handle = rman_get_bushandle(ctrlr->resource); - ctrlr->regs = (struct nvme_registers *)ctrlr->bus_handle; return (0); } diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 3dc62bc11384..95c38fe2e39e 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -286,8 +286,6 @@ struct nvme_controller { struct nvme_qpair adminq; struct nvme_qpair *ioq; - struct nvme_registers *regs; - struct nvme_controller_data cdata; struct nvme_namespace ns[NVME_MAX_NAMESPACES];
