Staticise devclasses and some unnecessarily global variables.

16 files changed, 17 insertions, 19 deletions

diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index d775236..8d16393 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -61,7 +61,7 @@
 
 extern void initializecpu(void);
 
-struct region_descriptor	r_idt, r_gdt, *p_gdt;
+static struct region_descriptor	r_idt, r_gdt, *p_gdt;
 static u_int16_t	r_ldt;
 
 static u_int32_t	r_eax, r_ebx, r_ecx, r_edx, r_ebp, r_esi, r_edi,
diff --git a/sys/dev/acpica/Osd/OsdInterrupt.c b/sys/dev/acpica/Osd/OsdInterrupt.c
index bccf946..ac62132 100644
--- a/sys/dev/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpica/Osd/OsdInterrupt.c
@@ -57,7 +57,7 @@ AcpiOsInstallInterruptHandler(UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
 
     FUNCTION_TRACE(__func__);
 
-    if ((sc = devclass_get_softc(acpi_devclass, 0)) == NULL)
+    if ((sc = devclass_get_softc(devclass_find("acpi"), 0)) == NULL)
 	panic("can't find ACPI device to register interrupt");
     if (sc->acpi_dev == NULL)
 	panic("acpi softc has invalid device");
@@ -108,7 +108,7 @@ AcpiOsRemoveInterruptHandler (UINT32 InterruptNumber, OSD_HANDLER ServiceRoutine
     if (ServiceRoutine == NULL)
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
 
-    if ((sc = devclass_get_softc(acpi_devclass, 0)) == NULL)
+    if ((sc = devclass_get_softc(find_devclass("acpi"), 0)) == NULL)
 	panic("can't find ACPI device to deregister interrupt");
 
     if (sc->acpi_irq == NULL)
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 6ebce70..32aadf5 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -168,7 +168,7 @@ static driver_t acpi_driver = {
     sizeof(struct acpi_softc),
 };
 
-devclass_t acpi_devclass;
+static devclass_t acpi_devclass;
 DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0);
 MODULE_VERSION(acpi, 100);
 
diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
index c909272..f245c8f 100644
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.c
@@ -183,7 +183,7 @@ acpi_battery_init(void)
 	struct acpi_softc	*sc;
 	int	 		 error;
 
-	if ((dev = devclass_get_device(acpi_devclass, 0)) == NULL) {
+	if ((dev = devclass_get_device(devclass_find("acpi"), 0)) == NULL) {
 		return (ENXIO);
 	}
 	if ((sc = device_get_softc(dev)) == NULL) {
diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
index b05c7d3..d1a047a 100644
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -71,7 +71,7 @@ static driver_t acpi_button_driver = {
     sizeof(struct acpi_button_softc),
 };
 
-devclass_t acpi_button_devclass;
+static devclass_t acpi_button_devclass;
 DRIVER_MODULE(acpi_button, acpi, acpi_button_driver, acpi_button_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_cpu.c b/sys/dev/acpica/acpi_cpu.c
index 51e9768..ec1f425 100644
--- a/sys/dev/acpica/acpi_cpu.c
+++ b/sys/dev/acpica/acpi_cpu.c
@@ -116,7 +116,7 @@ static driver_t acpi_cpu_driver = {
     sizeof(struct acpi_cpu_softc),
 };
 
-devclass_t acpi_cpu_devclass;
+static devclass_t acpi_cpu_devclass;
 DRIVER_MODULE(acpi_cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index 331d389..b5d7e74 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -308,7 +308,7 @@ static driver_t acpi_ec_driver = {
     sizeof(struct acpi_ec_softc),
 };
 
-devclass_t acpi_ec_devclass;
+static devclass_t acpi_ec_devclass;
 DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0);
 
 /*
diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c
index c688137..36d057a 100644
--- a/sys/dev/acpica/acpi_lid.c
+++ b/sys/dev/acpica/acpi_lid.c
@@ -72,7 +72,7 @@ static driver_t acpi_lid_driver = {
     sizeof(struct acpi_lid_softc),
 };
 
-devclass_t acpi_lid_devclass;
+static devclass_t acpi_lid_devclass;
 DRIVER_MODULE(acpi_lid, acpi, acpi_lid_driver, acpi_lid_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 87dfd48..57ce2a6 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -100,7 +100,7 @@ static driver_t acpi_pcib_driver = {
     sizeof(struct acpi_pcib_softc),
 };
 
-devclass_t acpi_pcib_devclass;
+static devclass_t acpi_pcib_devclass;
 DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_driver, acpi_pcib_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_pcib_acpi.c b/sys/dev/acpica/acpi_pcib_acpi.c
index 87dfd48..57ce2a6 100644
--- a/sys/dev/acpica/acpi_pcib_acpi.c
+++ b/sys/dev/acpica/acpi_pcib_acpi.c
@@ -100,7 +100,7 @@ static driver_t acpi_pcib_driver = {
     sizeof(struct acpi_pcib_softc),
 };
 
-devclass_t acpi_pcib_devclass;
+static devclass_t acpi_pcib_devclass;
 DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_driver, acpi_pcib_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_powerres.c b/sys/dev/acpica/acpi_powerres.c
index c6415fd..e9233d3 100644
--- a/sys/dev/acpica/acpi_powerres.c
+++ b/sys/dev/acpica/acpi_powerres.c
@@ -112,8 +112,8 @@ struct acpi_powerresource {
     ACPI_INTEGER	ap_order;
 };
 
-TAILQ_HEAD(acpi_powerresource_list, acpi_powerresource)	acpi_powerresources;
-TAILQ_HEAD(acpi_powerconsumer_list, acpi_powerconsumer)	acpi_powerconsumers;
+static TAILQ_HEAD(acpi_powerresource_list, acpi_powerresource)	acpi_powerresources;
+static TAILQ_HEAD(acpi_powerconsumer_list, acpi_powerconsumer)	acpi_powerconsumers;
 
 static ACPI_STATUS		acpi_pwr_register_consumer(ACPI_HANDLE consumer);
 static ACPI_STATUS		acpi_pwr_deregister_consumer(ACPI_HANDLE consumer);
diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c
index a3459d9..1538838 100644
--- a/sys/dev/acpica/acpi_resource.c
+++ b/sys/dev/acpica/acpi_resource.c
@@ -535,7 +535,7 @@ static driver_t acpi_sysresource_driver = {
     0,
 };
 
-devclass_t acpi_sysresource_devclass;
+static devclass_t acpi_sysresource_devclass;
 DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysresource_driver, acpi_sysresource_devclass, 0, 0);
 
 static int
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 9cde5f4..ba4f93f 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -122,7 +122,7 @@ static driver_t acpi_tz_driver = {
     sizeof(struct acpi_tz_softc),
 };
 
-devclass_t acpi_tz_devclass;
+static devclass_t acpi_tz_devclass;
 DRIVER_MODULE(acpi_tz, acpi, acpi_tz_driver, acpi_tz_devclass, 0, 0);
 
 static struct sysctl_ctx_list	acpi_tz_sysctl_ctx;
diff --git a/sys/dev/acpica/acpi_timer.c b/sys/dev/acpica/acpi_timer.c
index b97223d..441d2c0 100644
--- a/sys/dev/acpica/acpi_timer.c
+++ b/sys/dev/acpica/acpi_timer.c
@@ -88,7 +88,7 @@ static driver_t acpi_timer_driver = {
     0,
 };
 
-devclass_t acpi_timer_devclass;
+static devclass_t acpi_timer_devclass;
 DRIVER_MODULE(acpi_timer, acpi, acpi_timer_driver, acpi_timer_devclass, 0, 0);
 
 /*
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 2ce13fc..eb313d6 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -35,8 +35,6 @@
 #include <machine/bus.h>
 #include <machine/resource.h>
 
-extern devclass_t	acpi_devclass;
-
 struct acpi_softc {
     device_t		acpi_dev;
     dev_t		acpi_dev_t;
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index d775236..8d16393 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -61,7 +61,7 @@
 
 extern void initializecpu(void);
 
-struct region_descriptor	r_idt, r_gdt, *p_gdt;
+static struct region_descriptor	r_idt, r_gdt, *p_gdt;
 static u_int16_t	r_ldt;
 
 static u_int32_t	r_eax, r_ebx, r_ecx, r_edx, r_ebp, r_esi, r_edi,