git: 1093caa1bb55 - main - nvme: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:24:34 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=1093caa1bb554b29a8e4178b383311b51c225cc3
commit 1093caa1bb554b29a8e4178b383311b51c225cc3
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:55 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:55 +0000
nvme: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/dev/nvme/nvme.c | 2 --
sys/dev/nvme/nvme_ahci.c | 2 +-
sys/dev/nvme/nvme_pci.c | 2 +-
sys/dev/nvme/nvme_private.h | 2 --
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c
index 15fb456a1c54..6ad010dae1b8 100644
--- a/sys/dev/nvme/nvme.c
+++ b/sys/dev/nvme/nvme.c
@@ -53,8 +53,6 @@ int32_t nvme_retry_count;
MALLOC_DEFINE(M_NVME, "nvme", "nvme(4) memory allocations");
-devclass_t nvme_devclass;
-
static void
nvme_init(void)
{
diff --git a/sys/dev/nvme/nvme_ahci.c b/sys/dev/nvme/nvme_ahci.c
index b2d5813537c3..49ee5ebe493c 100644
--- a/sys/dev/nvme/nvme_ahci.c
+++ b/sys/dev/nvme/nvme_ahci.c
@@ -54,7 +54,7 @@ static driver_t nvme_ahci_driver = {
sizeof(struct nvme_controller),
};
-DRIVER_MODULE(nvme, ahci, nvme_ahci_driver, nvme_devclass, NULL, 0);
+DRIVER_MODULE(nvme, ahci, nvme_ahci_driver, NULL, NULL);
static int
nvme_ahci_probe (device_t device)
diff --git a/sys/dev/nvme/nvme_pci.c b/sys/dev/nvme/nvme_pci.c
index 20ffe6574dce..73d319b37c62 100644
--- a/sys/dev/nvme/nvme_pci.c
+++ b/sys/dev/nvme/nvme_pci.c
@@ -66,7 +66,7 @@ static driver_t nvme_pci_driver = {
sizeof(struct nvme_controller),
};
-DRIVER_MODULE(nvme, pci, nvme_pci_driver, nvme_devclass, NULL, 0);
+DRIVER_MODULE(nvme, pci, nvme_pci_driver, NULL, NULL);
static struct _pcsid
{
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index 5db5ac6a16ed..d9e64bfc7e2c 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -114,8 +114,6 @@ struct nvme_completion_poll_status {
int done;
};
-extern devclass_t nvme_devclass;
-
#define NVME_REQUEST_VADDR 1
#define NVME_REQUEST_NULL 2 /* For requests with no payload. */
#define NVME_REQUEST_UIO 3