git: 916a5d8ad5ff - main - acpi: Remove unused devclass arguments to DRIVER_MODULE.

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: John Baldwin <jhb_at_FreeBSD.org>
Date: Fri, 06 May 2022 22:42:50 UTC
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=916a5d8ad5ffe49a1bababd248a45e87f0161c40

commit 916a5d8ad5ffe49a1bababd248a45e87f0161c40
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-19 19:05:21 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:39:28 +0000

    acpi: Remove unused devclass arguments to DRIVER_MODULE.
---
 sys/dev/acpica/acpi.c           | 3 +--
 sys/dev/acpica/acpi_acad.c      | 3 +--
 sys/dev/acpica/acpi_apei.c      | 3 +--
 sys/dev/acpica/acpi_button.c    | 4 +---
 sys/dev/acpica/acpi_cmbat.c     | 3 +--
 sys/dev/acpica/acpi_container.c | 5 +----
 sys/dev/acpica/acpi_cpu.c       | 3 +--
 sys/dev/acpica/acpi_dock.c      | 4 +---
 sys/dev/acpica/acpi_ec.c        | 3 +--
 sys/dev/acpica/acpi_hpet.c      | 4 +---
 sys/dev/acpica/acpi_lid.c       | 3 +--
 sys/dev/acpica/acpi_pci.c       | 4 +---
 sys/dev/acpica/acpi_pci_link.c  | 5 +----
 sys/dev/acpica/acpi_pcib_acpi.c | 4 +---
 sys/dev/acpica/acpi_pcib_pci.c  | 4 +---
 sys/dev/acpica/acpi_perf.c      | 3 +--
 sys/dev/acpica/acpi_resource.c  | 4 +---
 sys/dev/acpica/acpi_smbat.c     | 3 +--
 sys/dev/acpica/acpi_thermal.c   | 3 +--
 sys/dev/acpica/acpi_throttle.c  | 4 +---
 sys/dev/acpica/acpi_timer.c     | 3 +--
 sys/dev/acpica/acpi_video.c     | 5 +----
 22 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 831e618d430f..2488e5aa83f0 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -249,8 +249,7 @@ static driver_t acpi_driver = {
     sizeof(struct acpi_softc),
 };
 
-static devclass_t acpi_devclass;
-EARLY_DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0,
+EARLY_DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_modevent, 0,
     BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
 MODULE_VERSION(acpi, 1);
 
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 75e0d7803bad..823abf9a4cf4 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.c
@@ -84,8 +84,7 @@ static driver_t acpi_acad_driver = {
     sizeof(struct acpi_acad_softc),
 };
 
-static devclass_t acpi_acad_devclass;
-DRIVER_MODULE(acpi_acad, acpi, acpi_acad_driver, acpi_acad_devclass, 0, 0);
+DRIVER_MODULE(acpi_acad, acpi, acpi_acad_driver, 0, 0);
 MODULE_DEPEND(acpi_acad, acpi, 1, 1, 1);
 
 ACPI_SERIAL_DECL(acad, "ACPI AC adapter");
diff --git a/sys/dev/acpica/acpi_apei.c b/sys/dev/acpica/acpi_apei.c
index 723928f2fac9..8349d81b9060 100644
--- a/sys/dev/acpica/acpi_apei.c
+++ b/sys/dev/acpica/acpi_apei.c
@@ -563,7 +563,6 @@ hest_parse_table(struct apei_softc *sc)
 }
 
 static char *apei_ids[] = { "PNP0C33", NULL };
-static devclass_t apei_devclass;
 
 static ACPI_STATUS
 apei_find(ACPI_HANDLE handle, UINT32 level, void *context,
@@ -779,5 +778,5 @@ static driver_t	apei_driver = {
 	sizeof(struct apei_softc),
 };
 
-DRIVER_MODULE(apei, acpi, apei_driver, apei_devclass, 0, 0);
+DRIVER_MODULE(apei, acpi, apei_driver, 0, 0);
 MODULE_DEPEND(apei, acpi, 1, 1, 1);
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index dc0ea7225cba..492f64e00f4d 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -97,9 +97,7 @@ static driver_t acpi_button_driver = {
     sizeof(struct acpi_button_softc),
 };
 
-static devclass_t acpi_button_devclass;
-DRIVER_MODULE(acpi_button, acpi, acpi_button_driver, acpi_button_devclass,
-	      0, 0);
+DRIVER_MODULE(acpi_button, acpi, acpi_button_driver, 0, 0);
 MODULE_DEPEND(acpi_button, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_cmbat.c b/sys/dev/acpica/acpi_cmbat.c
index 119e42b9fb21..407b6dace5d4 100644
--- a/sys/dev/acpica/acpi_cmbat.c
+++ b/sys/dev/acpica/acpi_cmbat.c
@@ -109,8 +109,7 @@ static driver_t acpi_cmbat_driver = {
     sizeof(struct acpi_cmbat_softc),
 };
 
-static devclass_t acpi_cmbat_devclass;
-DRIVER_MODULE(acpi_cmbat, acpi, acpi_cmbat_driver, acpi_cmbat_devclass, 0, 0);
+DRIVER_MODULE(acpi_cmbat, acpi, acpi_cmbat_driver, 0, 0);
 MODULE_DEPEND(acpi_cmbat, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_container.c b/sys/dev/acpica/acpi_container.c
index 0a4b123c5303..e9112e700ef5 100644
--- a/sys/dev/acpica/acpi_container.c
+++ b/sys/dev/acpica/acpi_container.c
@@ -88,10 +88,7 @@ static driver_t acpi_syscont_driver = {
     0,
 };
 
-static devclass_t acpi_syscont_devclass;
-
-DRIVER_MODULE(acpi_syscontainer, acpi, acpi_syscont_driver,
-    acpi_syscont_devclass, NULL, NULL);
+DRIVER_MODULE(acpi_syscontainer, acpi, acpi_syscont_driver, NULL, NULL);
 MODULE_DEPEND(acpi_syscontainer, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 1663609d970b..762ea37cfa34 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -221,8 +221,7 @@ static driver_t acpi_cpu_driver = {
     sizeof(struct acpi_cpu_softc),
 };
 
-static devclass_t acpi_cpu_devclass;
-DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0);
+DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, 0, 0);
 MODULE_DEPEND(cpu, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_dock.c b/sys/dev/acpica/acpi_dock.c
index 2b7a451bfe87..8fad38fe61d0 100644
--- a/sys/dev/acpica/acpi_dock.c
+++ b/sys/dev/acpica/acpi_dock.c
@@ -543,8 +543,6 @@ static driver_t	acpi_dock_driver = {
 	sizeof(struct acpi_dock_softc),
 };
 
-static devclass_t acpi_dock_devclass;
-
-DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, acpi_dock_devclass, 0, 0);
+DRIVER_MODULE(acpi_dock, acpi, acpi_dock_driver, 0, 0);
 MODULE_DEPEND(acpi_dock, acpi, 1, 1, 1);
 ACPI_PNP_INFO(acpi_dock_pnp_ids);
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index af6b5338c167..35397b7c93d5 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -262,8 +262,7 @@ static driver_t acpi_ec_driver = {
     sizeof(struct acpi_ec_softc),
 };
 
-static devclass_t acpi_ec_devclass;
-DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0);
+DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, 0, 0);
 MODULE_DEPEND(acpi_ec, acpi, 1, 1, 1);
 
 /*
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index c940ee5951ab..9ed7c5a47b35 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -69,8 +69,6 @@ __FBSDID("$FreeBSD$");
 
 ACPI_SERIAL_DECL(hpet, "ACPI HPET support");
 
-static devclass_t hpet_devclass;
-
 /* ACPI CA debugging */
 #define _COMPONENT	ACPI_TIMER
 ACPI_MODULE_NAME("HPET")
@@ -1009,5 +1007,5 @@ static driver_t	hpet_driver = {
 	sizeof(struct hpet_softc),
 };
 
-DRIVER_MODULE(hpet, acpi, hpet_driver, hpet_devclass, 0, 0);
+DRIVER_MODULE(hpet, acpi, hpet_driver, 0, 0);
 MODULE_DEPEND(hpet, acpi, 1, 1, 1);
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index 51cd50516ecc..8b20f7786d2b 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -90,8 +90,7 @@ static driver_t acpi_lid_driver = {
     sizeof(struct acpi_lid_softc),
 };
 
-static devclass_t acpi_lid_devclass;
-DRIVER_MODULE(acpi_lid, acpi, acpi_lid_driver, acpi_lid_devclass, 0, 0);
+DRIVER_MODULE(acpi_lid, acpi, acpi_lid_driver, 0, 0);
 MODULE_DEPEND(acpi_lid, acpi, 1, 1, 1);
 
 static void
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 84100cf5f403..56d2b93d0613 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -120,11 +120,9 @@ static device_method_t acpi_pci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t pci_devclass;
-
 DEFINE_CLASS_1(pci, acpi_pci_driver, acpi_pci_methods, sizeof(struct pci_softc),
     pci_driver);
-DRIVER_MODULE(acpi_pci, pcib, acpi_pci_driver, pci_devclass, 0, 0);
+DRIVER_MODULE(acpi_pci, pcib, acpi_pci_driver, 0, 0);
 MODULE_DEPEND(acpi_pci, acpi, 1, 1, 1);
 MODULE_DEPEND(acpi_pci, pci, 1, 1, 1);
 MODULE_VERSION(acpi_pci, 1);
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 3dab2807bd92..0b33772d6c6f 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -1123,8 +1123,5 @@ static driver_t acpi_pci_link_driver = {
 	sizeof(struct acpi_pci_link_softc),
 };
 
-static devclass_t pci_link_devclass;
-
-DRIVER_MODULE(acpi_pci_link, acpi, acpi_pci_link_driver, pci_link_devclass, 0,
-    0);
+DRIVER_MODULE(acpi_pci_link, acpi, acpi_pci_link_driver, 0, 0);
 MODULE_DEPEND(acpi_pci_link, acpi, 1, 1, 1);
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 59f255cdba16..6a66dfb5012a 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -156,11 +156,9 @@ static device_method_t acpi_pcib_acpi_methods[] = {
     DEVMETHOD_END
 };
 
-static devclass_t pcib_devclass;
-
 DEFINE_CLASS_0(pcib, acpi_pcib_acpi_driver, acpi_pcib_acpi_methods,
     sizeof(struct acpi_hpcib_softc));
-DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, 0, 0);
 MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_pcib_pci.c b/sys/dev/acpica/acpi_pcib_pci.c
index 8f4464256f6c..2c1db6fdf0f6 100644
--- a/sys/dev/acpica/acpi_pcib_pci.c
+++ b/sys/dev/acpica/acpi_pcib_pci.c
@@ -89,11 +89,9 @@ static device_method_t acpi_pcib_pci_methods[] = {
     DEVMETHOD_END
 };
 
-static devclass_t pcib_devclass;
-
 DEFINE_CLASS_1(pcib, acpi_pcib_pci_driver, acpi_pcib_pci_methods,
     sizeof(struct acpi_pcib_softc), pcib_driver);
-DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, 0, 0);
 MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_perf.c b/sys/dev/acpica/acpi_perf.c
index 5134bbaaa4dc..393d9dea7772 100644
--- a/sys/dev/acpica/acpi_perf.c
+++ b/sys/dev/acpica/acpi_perf.c
@@ -132,8 +132,7 @@ static driver_t acpi_perf_driver = {
 	sizeof(struct acpi_perf_softc),
 };
 
-static devclass_t acpi_perf_devclass;
-DRIVER_MODULE(acpi_perf, cpu, acpi_perf_driver, acpi_perf_devclass, 0, 0);
+DRIVER_MODULE(acpi_perf, cpu, acpi_perf_driver, 0, 0);
 MODULE_DEPEND(acpi_perf, acpi, 1, 1, 1);
 
 static MALLOC_DEFINE(M_ACPIPERF, "acpi_perf", "ACPI Performance states");
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index d7945f03e402..fad10a7df381 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -751,9 +751,7 @@ static driver_t acpi_sysres_driver = {
     0,
 };
 
-static devclass_t acpi_sysres_devclass;
-DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysres_driver, acpi_sysres_devclass,
-    0, 0);
+DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysres_driver, 0, 0);
 MODULE_DEPEND(acpi_sysresource, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c
index 65995ac77eec..89b873f986da 100644
--- a/sys/dev/acpica/acpi_smbat.c
+++ b/sys/dev/acpica/acpi_smbat.c
@@ -99,8 +99,7 @@ static driver_t	acpi_smbat_driver = {
 	sizeof(struct acpi_smbat_softc),
 };
 
-static devclass_t acpi_smbat_devclass;
-DRIVER_MODULE(acpi_smbat, acpi, acpi_smbat_driver, acpi_smbat_devclass, 0, 0);
+DRIVER_MODULE(acpi_smbat, acpi, acpi_smbat_driver, 0, 0);
 MODULE_DEPEND(acpi_smbat, acpi, 1, 1, 1);
 
 static int
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index f6b19f56b862..7a5cb8ebb64e 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -165,8 +165,7 @@ static driver_t acpi_tz_driver = {
 
 static char *acpi_tz_tmp_name = "_TMP";
 
-static devclass_t acpi_tz_devclass;
-DRIVER_MODULE(acpi_tz, acpi, acpi_tz_driver, acpi_tz_devclass, 0, 0);
+DRIVER_MODULE(acpi_tz, acpi, acpi_tz_driver, 0, 0);
 MODULE_DEPEND(acpi_tz, acpi, 1, 1, 1);
 
 static struct sysctl_ctx_list	acpi_tz_sysctl_ctx;
diff --git a/sys/dev/acpica/acpi_throttle.c b/sys/dev/acpica/acpi_throttle.c
index a9cc2d77ecf9..502dae6971e1 100644
--- a/sys/dev/acpica/acpi_throttle.c
+++ b/sys/dev/acpica/acpi_throttle.c
@@ -123,9 +123,7 @@ static driver_t acpi_throttle_driver = {
 	sizeof(struct acpi_throttle_softc),
 };
 
-static devclass_t acpi_throttle_devclass;
-DRIVER_MODULE(acpi_throttle, cpu, acpi_throttle_driver, acpi_throttle_devclass,
-    0, 0);
+DRIVER_MODULE(acpi_throttle, cpu, acpi_throttle_driver, 0, 0);
 
 static void
 acpi_throttle_identify(driver_t *driver, device_t parent)
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index 633d5bf52f1d..a837e643ff1e 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -96,8 +96,7 @@ static driver_t acpi_timer_driver = {
     0,
 };
 
-static devclass_t acpi_timer_devclass;
-DRIVER_MODULE(acpi_timer, acpi, acpi_timer_driver, acpi_timer_devclass, 0, 0);
+DRIVER_MODULE(acpi_timer, acpi, acpi_timer_driver, 0, 0);
 MODULE_DEPEND(acpi_timer, acpi, 1, 1, 1);
 
 static struct timecounter acpi_timer_timecounter = {
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index cbe31d3a66c2..c559cff102bd 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -187,10 +187,7 @@ static driver_t acpi_video_driver = {
 	sizeof(struct acpi_video_softc),
 };
 
-static devclass_t acpi_video_devclass;
-
-DRIVER_MODULE(acpi_video, vgapci, acpi_video_driver, acpi_video_devclass,
-	      acpi_video_modevent, NULL);
+DRIVER_MODULE(acpi_video, vgapci, acpi_video_driver, acpi_video_modevent, NULL);
 MODULE_DEPEND(acpi_video, acpi, 1, 1, 1);
 #ifdef EVDEV_SUPPORT
 MODULE_DEPEND(acpi_video, evdev, 1, 1, 1);