diff --git a/sys/arm/nvidia/as3722.c b/sys/arm/nvidia/as3722.c
index b7de41f815d9..9f441e96c05b 100644
--- a/sys/arm/nvidia/as3722.c
+++ b/sys/arm/nvidia/as3722.c
@@ -398,8 +398,6 @@ static device_method_t as3722_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t as3722_devclass;
 static DEFINE_CLASS_0(gpio, as3722_driver, as3722_methods,
     sizeof(struct as3722_softc));
-EARLY_DRIVER_MODULE(as3722, iicbus, as3722_driver, as3722_devclass,
-    NULL, NULL, 74);
+EARLY_DRIVER_MODULE(as3722, iicbus, as3722_driver, NULL, NULL, 74);
diff --git a/sys/arm/nvidia/drm2/tegra_dc.c b/sys/arm/nvidia/drm2/tegra_dc.c
index a5e661dab6b2..110f3611bf87 100644
--- a/sys/arm/nvidia/drm2/tegra_dc.c
+++ b/sys/arm/nvidia/drm2/tegra_dc.c
@@ -1435,7 +1435,6 @@ static device_method_t tegra_dc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_dc_devclass;
 DEFINE_CLASS_0(tegra_dc, tegra_dc_driver, tegra_dc_methods,
     sizeof(struct dc_softc));
-DRIVER_MODULE(tegra_dc, host1x, tegra_dc_driver, tegra_dc_devclass, NULL, NULL);
+DRIVER_MODULE(tegra_dc, host1x, tegra_dc_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/drm2/tegra_hdmi.c b/sys/arm/nvidia/drm2/tegra_hdmi.c
index 0c9315ec31a0..e8788e9bc4f2 100644
--- a/sys/arm/nvidia/drm2/tegra_hdmi.c
+++ b/sys/arm/nvidia/drm2/tegra_hdmi.c
@@ -1313,8 +1313,6 @@ static device_method_t tegra_hdmi_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_hdmi_devclass;
 DEFINE_CLASS_0(tegra_hdmi, tegra_hdmi_driver, tegra_hdmi_methods,
     sizeof(struct hdmi_softc));
-DRIVER_MODULE(tegra_hdmi, host1x, tegra_hdmi_driver,
-tegra_hdmi_devclass, 0, 0);
+DRIVER_MODULE(tegra_hdmi, host1x, tegra_hdmi_driver, 0, 0);
diff --git a/sys/arm/nvidia/drm2/tegra_host1x.c b/sys/arm/nvidia/drm2/tegra_host1x.c
index dae5529c7ba1..ca9785fdd3c2 100644
--- a/sys/arm/nvidia/drm2/tegra_host1x.c
+++ b/sys/arm/nvidia/drm2/tegra_host1x.c
@@ -633,11 +633,9 @@ static device_method_t host1x_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t host1x_devclass;
 DEFINE_CLASS_1(host1x, host1x_driver, host1x_methods,
     sizeof(struct host1x_softc), simplebus_driver);
-EARLY_DRIVER_MODULE(host1x, simplebus, host1x_driver,
-    host1x_devclass, 0, 0,  BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(host1x, simplebus, host1x_driver, 0, 0, BUS_PASS_BUS);
 
 /* Bindings for fbd device. */
 extern driver_t fbd_driver;
diff --git a/sys/arm/nvidia/tegra124/tegra124_car.c b/sys/arm/nvidia/tegra124/tegra124_car.c
index 49246889c062..4eaa3216dbe4 100644
--- a/sys/arm/nvidia/tegra124/tegra124_car.c
+++ b/sys/arm/nvidia/tegra124/tegra124_car.c
@@ -596,8 +596,7 @@ static device_method_t tegra124_car_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra124_car_devclass;
 static DEFINE_CLASS_0(car, tegra124_car_driver, tegra124_car_methods,
     sizeof(struct tegra124_car_softc));
-EARLY_DRIVER_MODULE(tegra124_car, simplebus, tegra124_car_driver,
-    tegra124_car_devclass, NULL, NULL, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(tegra124_car, simplebus, tegra124_car_driver, NULL, NULL,
+    BUS_PASS_TIMER);
diff --git a/sys/arm/nvidia/tegra124/tegra124_coretemp.c b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
index a6d9607146c0..629f788dedf4 100644
--- a/sys/arm/nvidia/tegra124/tegra124_coretemp.c
+++ b/sys/arm/nvidia/tegra124/tegra124_coretemp.c
@@ -258,8 +258,6 @@ static device_method_t tegra124_coretemp_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra124_coretemp_devclass;
 static DEFINE_CLASS_0(tegra124_coretemp, tegra124_coretemp_driver,
     tegra124_coretemp_methods, sizeof(struct tegra124_coretemp_softc));
-DRIVER_MODULE(tegra124_coretemp, cpu, tegra124_coretemp_driver,
-    tegra124_coretemp_devclass, NULL, NULL);
+DRIVER_MODULE(tegra124_coretemp, cpu, tegra124_coretemp_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
index fe14f62c3c40..7047b07ff142 100644
--- a/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
+++ b/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
@@ -586,8 +586,6 @@ static device_method_t tegra124_cpufreq_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra124_cpufreq_devclass;
 static DEFINE_CLASS_0(tegra124_cpufreq, tegra124_cpufreq_driver,
     tegra124_cpufreq_methods, sizeof(struct tegra124_cpufreq_softc));
-DRIVER_MODULE(tegra124_cpufreq, cpu, tegra124_cpufreq_driver,
-    tegra124_cpufreq_devclass, NULL, NULL);
+DRIVER_MODULE(tegra124_cpufreq, cpu, tegra124_cpufreq_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/tegra124/tegra124_pmc.c b/sys/arm/nvidia/tegra124/tegra124_pmc.c
index 2af3826587cd..a6687710d960 100644
--- a/sys/arm/nvidia/tegra124/tegra124_pmc.c
+++ b/sys/arm/nvidia/tegra124/tegra124_pmc.c
@@ -555,8 +555,7 @@ static device_method_t tegra124_pmc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra124_pmc_devclass;
 static DEFINE_CLASS_0(pmc, tegra124_pmc_driver, tegra124_pmc_methods,
     sizeof(struct tegra124_pmc_softc));
-EARLY_DRIVER_MODULE(tegra124_pmc, simplebus, tegra124_pmc_driver,
-    tegra124_pmc_devclass, NULL, NULL, 70);
+EARLY_DRIVER_MODULE(tegra124_pmc, simplebus, tegra124_pmc_driver, NULL, NULL,
+    70);
diff --git a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
index f41234197335..ee86c05f0d68 100644
--- a/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
+++ b/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
@@ -1199,8 +1199,7 @@ static device_method_t tegra_xusbpadctl_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_xusbpadctl_devclass;
 static DEFINE_CLASS_0(xusbpadctl, tegra_xusbpadctl_driver,
     tegra_xusbpadctl_methods, sizeof(struct padctl_softc));
 EARLY_DRIVER_MODULE(tegra_xusbpadctl, simplebus, tegra_xusbpadctl_driver,
-    tegra_xusbpadctl_devclass, NULL, NULL, 73);
+    NULL, NULL, 73);
diff --git a/sys/arm/nvidia/tegra_abpmisc.c b/sys/arm/nvidia/tegra_abpmisc.c
index 8a8e39862ca3..38c2f5cc9bdb 100644
--- a/sys/arm/nvidia/tegra_abpmisc.c
+++ b/sys/arm/nvidia/tegra_abpmisc.c
@@ -186,8 +186,7 @@ static device_method_t tegra_abpmisc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_abpmisc_devclass;
 static DEFINE_CLASS_0(abpmisc, tegra_abpmisc_driver, tegra_abpmisc_methods,
     sizeof(struct tegra_abpmisc_softc));
-EARLY_DRIVER_MODULE(tegra_abpmisc, simplebus, tegra_abpmisc_driver,
-    tegra_abpmisc_devclass, NULL, NULL, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(tegra_abpmisc, simplebus, tegra_abpmisc_driver, NULL, NULL,
+    BUS_PASS_TIMER);
diff --git a/sys/arm/nvidia/tegra_efuse.c b/sys/arm/nvidia/tegra_efuse.c
index 226f694fe8b2..d789dfe5d834 100644
--- a/sys/arm/nvidia/tegra_efuse.c
+++ b/sys/arm/nvidia/tegra_efuse.c
@@ -524,8 +524,7 @@ static device_method_t tegra_efuse_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_efuse_devclass;
 static DEFINE_CLASS_0(efuse, tegra_efuse_driver, tegra_efuse_methods,
     sizeof(struct tegra_efuse_softc));
-EARLY_DRIVER_MODULE(tegra_efuse, simplebus, tegra_efuse_driver,
-    tegra_efuse_devclass, NULL, NULL, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(tegra_efuse, simplebus, tegra_efuse_driver, NULL, NULL,
+    BUS_PASS_TIMER);
diff --git a/sys/arm/nvidia/tegra_ehci.c b/sys/arm/nvidia/tegra_ehci.c
index d3c97c117842..811c0e58ccd8 100644
--- a/sys/arm/nvidia/tegra_ehci.c
+++ b/sys/arm/nvidia/tegra_ehci.c
@@ -311,8 +311,7 @@ static device_method_t ehci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t ehci_devclass;
 static DEFINE_CLASS_0(ehci, ehci_driver, ehci_methods,
     sizeof(struct tegra_ehci_softc));
-DRIVER_MODULE(tegra_ehci, simplebus, ehci_driver, ehci_devclass, NULL, NULL);
+DRIVER_MODULE(tegra_ehci, simplebus, ehci_driver, NULL, NULL);
 MODULE_DEPEND(tegra_ehci, usb, 1, 1, 1);
diff --git a/sys/arm/nvidia/tegra_gpio.c b/sys/arm/nvidia/tegra_gpio.c
index 17a7ac2a9fb7..c3f410713846 100644
--- a/sys/arm/nvidia/tegra_gpio.c
+++ b/sys/arm/nvidia/tegra_gpio.c
@@ -882,8 +882,6 @@ static device_method_t tegra_gpio_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_gpio_devclass;
 static DEFINE_CLASS_0(gpio, tegra_gpio_driver, tegra_gpio_methods,
     sizeof(struct tegra_gpio_softc));
-EARLY_DRIVER_MODULE(tegra_gpio, simplebus, tegra_gpio_driver,
-    tegra_gpio_devclass, NULL, NULL, 70);
+EARLY_DRIVER_MODULE(tegra_gpio, simplebus, tegra_gpio_driver, NULL, NULL, 70);
diff --git a/sys/arm/nvidia/tegra_i2c.c b/sys/arm/nvidia/tegra_i2c.c
index 359b51e2609b..d60d26061657 100644
--- a/sys/arm/nvidia/tegra_i2c.c
+++ b/sys/arm/nvidia/tegra_i2c.c
@@ -794,8 +794,6 @@ static device_method_t tegra_i2c_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_i2c_devclass;
 static DEFINE_CLASS_0(iichb, tegra_i2c_driver, tegra_i2c_methods,
     sizeof(struct tegra_i2c_softc));
-EARLY_DRIVER_MODULE(tegra_iic, simplebus, tegra_i2c_driver, tegra_i2c_devclass,
-    NULL, NULL, 73);
+EARLY_DRIVER_MODULE(tegra_iic, simplebus, tegra_i2c_driver, NULL, NULL, 73);
diff --git a/sys/arm/nvidia/tegra_lic.c b/sys/arm/nvidia/tegra_lic.c
index d457bd4b0f73..0c764a249972 100644
--- a/sys/arm/nvidia/tegra_lic.c
+++ b/sys/arm/nvidia/tegra_lic.c
@@ -281,8 +281,7 @@ static device_method_t tegra_lic_methods[] = {
 	DEVMETHOD_END
 };
 
-devclass_t tegra_lic_devclass;
 static DEFINE_CLASS_0(lic, tegra_lic_driver, tegra_lic_methods,
     sizeof(struct tegra_lic_sc));
-EARLY_DRIVER_MODULE(tegra_lic, simplebus, tegra_lic_driver, tegra_lic_devclass,
-    NULL, NULL, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE + 1);
+EARLY_DRIVER_MODULE(tegra_lic, simplebus, tegra_lic_driver, NULL, NULL,
+    BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE + 1);
diff --git a/sys/arm/nvidia/tegra_mc.c b/sys/arm/nvidia/tegra_mc.c
index 7ff480b55dbd..90b4d6d470eb 100644
--- a/sys/arm/nvidia/tegra_mc.c
+++ b/sys/arm/nvidia/tegra_mc.c
@@ -304,8 +304,6 @@ static device_method_t tegra_mc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_mc_devclass;
 static DEFINE_CLASS_0(mc, tegra_mc_driver, tegra_mc_methods,
     sizeof(struct tegra_mc_softc));
-DRIVER_MODULE(tegra_mc, simplebus, tegra_mc_driver, tegra_mc_devclass,
-    NULL, NULL);
+DRIVER_MODULE(tegra_mc, simplebus, tegra_mc_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/tegra_pcie.c b/sys/arm/nvidia/tegra_pcie.c
index 707579b9e44f..f40692eeac2a 100644
--- a/sys/arm/nvidia/tegra_pcie.c
+++ b/sys/arm/nvidia/tegra_pcie.c
@@ -1616,8 +1616,6 @@ static device_method_t tegra_pcib_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t pcib_devclass;
 DEFINE_CLASS_1(pcib, tegra_pcib_driver, tegra_pcib_methods,
     sizeof(struct tegra_pcib_softc), ofw_pcib_driver);
-DRIVER_MODULE(tegra_pcib, simplebus, tegra_pcib_driver, pcib_devclass,
-    NULL, NULL);
+DRIVER_MODULE(tegra_pcib, simplebus, tegra_pcib_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/tegra_pinmux.c b/sys/arm/nvidia/tegra_pinmux.c
index 633485ee7b6a..a9148ca95234 100644
--- a/sys/arm/nvidia/tegra_pinmux.c
+++ b/sys/arm/nvidia/tegra_pinmux.c
@@ -788,8 +788,7 @@ static device_method_t tegra_pinmux_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_pinmux_devclass;
 static DEFINE_CLASS_0(pinmux, tegra_pinmux_driver, tegra_pinmux_methods,
     sizeof(struct pinmux_softc));
-EARLY_DRIVER_MODULE(tegra_pinmux, simplebus, tegra_pinmux_driver,
-    tegra_pinmux_devclass, NULL, NULL, 71);
+EARLY_DRIVER_MODULE(tegra_pinmux, simplebus, tegra_pinmux_driver, NULL, NULL,
+    71);
diff --git a/sys/arm/nvidia/tegra_rtc.c b/sys/arm/nvidia/tegra_rtc.c
index 070270367e1d..3f6d87d633df 100644
--- a/sys/arm/nvidia/tegra_rtc.c
+++ b/sys/arm/nvidia/tegra_rtc.c
@@ -294,8 +294,6 @@ static device_method_t tegra_rtc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_rtc_devclass;
 static DEFINE_CLASS_0(rtc, tegra_rtc_driver, tegra_rtc_methods,
     sizeof(struct tegra_rtc_softc));
-DRIVER_MODULE(tegra_rtc, simplebus, tegra_rtc_driver, tegra_rtc_devclass,
-    NULL, NULL);
+DRIVER_MODULE(tegra_rtc, simplebus, tegra_rtc_driver, NULL, NULL);
diff --git a/sys/arm/nvidia/tegra_sdhci.c b/sys/arm/nvidia/tegra_sdhci.c
index 9d7fbb0ddb1a..2198cb422942 100644
--- a/sys/arm/nvidia/tegra_sdhci.c
+++ b/sys/arm/nvidia/tegra_sdhci.c
@@ -465,11 +465,9 @@ static device_method_t tegra_sdhci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_sdhci_devclass;
 static DEFINE_CLASS_0(sdhci, tegra_sdhci_driver, tegra_sdhci_methods,
     sizeof(struct tegra_sdhci_softc));
-DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, tegra_sdhci_devclass,
-    NULL, NULL);
+DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, NULL, NULL);
 SDHCI_DEPEND(sdhci_tegra);
 #ifndef MMCCAM
 MMC_DECLARE_BRIDGE(sdhci);
diff --git a/sys/arm/nvidia/tegra_soctherm.c b/sys/arm/nvidia/tegra_soctherm.c
index d90e97e59159..aa5ba83f5814 100644
--- a/sys/arm/nvidia/tegra_soctherm.c
+++ b/sys/arm/nvidia/tegra_soctherm.c
@@ -837,8 +837,7 @@ static device_method_t tegra_soctherm_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_soctherm_devclass;
 static DEFINE_CLASS_0(soctherm, tegra_soctherm_driver, tegra_soctherm_methods,
     sizeof(struct soctherm_softc));
 EARLY_DRIVER_MODULE(tegra_soctherm, simplebus, tegra_soctherm_driver,
-    tegra_soctherm_devclass, NULL, NULL, 79);
+    NULL, NULL, 79);
diff --git a/sys/arm/nvidia/tegra_usbphy.c b/sys/arm/nvidia/tegra_usbphy.c
index 1adc90e8418a..3e334a85074c 100644
--- a/sys/arm/nvidia/tegra_usbphy.c
+++ b/sys/arm/nvidia/tegra_usbphy.c
@@ -844,8 +844,7 @@ static device_method_t tegra_usbphy_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_usbphy_devclass;
 static DEFINE_CLASS_0(usbphy, tegra_usbphy_driver, tegra_usbphy_methods,
     sizeof(struct usbphy_softc));
-EARLY_DRIVER_MODULE(tegra_usbphy, simplebus, tegra_usbphy_driver,
-    tegra_usbphy_devclass, NULL, NULL, 79);
+EARLY_DRIVER_MODULE(tegra_usbphy, simplebus, tegra_usbphy_driver, NULL, NULL,
+    79);
diff --git a/sys/arm/nvidia/tegra_xhci.c b/sys/arm/nvidia/tegra_xhci.c
index bfaf761232ee..edf62f823d2c 100644
--- a/sys/arm/nvidia/tegra_xhci.c
+++ b/sys/arm/nvidia/tegra_xhci.c
@@ -1118,8 +1118,7 @@ static device_method_t xhci_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t xhci_devclass;
 static DEFINE_CLASS_0(xhci, xhci_driver, xhci_methods,
     sizeof(struct tegra_xhci_softc));
-DRIVER_MODULE(tegra_xhci, simplebus, xhci_driver, xhci_devclass, NULL, NULL);
+DRIVER_MODULE(tegra_xhci, simplebus, xhci_driver, NULL, NULL);
 MODULE_DEPEND(tegra_xhci, usb, 1, 1, 1);
diff --git a/sys/arm64/nvidia/tegra210/max77620.c b/sys/arm64/nvidia/tegra210/max77620.c
index 329e8b94322a..fb0e43c517db 100644
--- a/sys/arm64/nvidia/tegra210/max77620.c
+++ b/sys/arm64/nvidia/tegra210/max77620.c
@@ -501,8 +501,6 @@ static device_method_t max77620_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t max77620_devclass;
 static DEFINE_CLASS_0(gpio, max77620_driver, max77620_methods,
     sizeof(struct max77620_softc));
-EARLY_DRIVER_MODULE(max77620, iicbus, max77620_driver, max77620_devclass,
-    NULL, NULL, 74);
+EARLY_DRIVER_MODULE(max77620, iicbus, max77620_driver, NULL, NULL, 74);
diff --git a/sys/arm64/nvidia/tegra210/max77620_rtc.c b/sys/arm64/nvidia/tegra210/max77620_rtc.c
index 4dace946a891..a165d0f4a55d 100644
--- a/sys/arm64/nvidia/tegra210/max77620_rtc.c
+++ b/sys/arm64/nvidia/tegra210/max77620_rtc.c
@@ -417,8 +417,6 @@ static device_method_t max77620_rtc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t max77620_rtc_devclass;
 static DEFINE_CLASS_0(rtc, max77620_rtc_driver, max77620_rtc_methods,
     sizeof(struct max77620_rtc_softc));
-EARLY_DRIVER_MODULE(max77620rtc_, iicbus, max77620_rtc_driver,
-    max77620_rtc_devclass, NULL, NULL, 74);
+EARLY_DRIVER_MODULE(max77620rtc_, iicbus, max77620_rtc_driver, NULL, NULL, 74);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_car.c b/sys/arm64/nvidia/tegra210/tegra210_car.c
index 149fb7864def..2a8ae6a56fa6 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_car.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_car.c
@@ -594,8 +594,7 @@ static device_method_t tegra210_car_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra210_car_devclass;
 static DEFINE_CLASS_0(car, tegra210_car_driver, tegra210_car_methods,
     sizeof(struct tegra210_car_softc));
-EARLY_DRIVER_MODULE(tegra210_car, simplebus, tegra210_car_driver,
-    tegra210_car_devclass, NULL, NULL, BUS_PASS_TIMER);
+EARLY_DRIVER_MODULE(tegra210_car, simplebus, tegra210_car_driver, NULL, NULL,
+    BUS_PASS_TIMER);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
index 6f7323f6d6ce..b13e3e4d184f 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_coretemp.c
@@ -262,8 +262,6 @@ static device_method_t tegra210_coretemp_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra210_coretemp_devclass;
 static DEFINE_CLASS_0(tegra210_coretemp, tegra210_coretemp_driver,
     tegra210_coretemp_methods, sizeof(struct tegra210_coretemp_softc));
-DRIVER_MODULE(tegra210_coretemp, cpu, tegra210_coretemp_driver,
-    tegra210_coretemp_devclass, NULL, NULL);
+DRIVER_MODULE(tegra210_coretemp, cpu, tegra210_coretemp_driver, NULL, NULL);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
index f92fb4edcf96..90fdf2ed012b 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_cpufreq.c
@@ -494,8 +494,6 @@ static device_method_t tegra210_cpufreq_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra210_cpufreq_devclass;
 static DEFINE_CLASS_0(tegra210_cpufreq, tegra210_cpufreq_driver,
     tegra210_cpufreq_methods, sizeof(struct tegra210_cpufreq_softc));
-DRIVER_MODULE(tegra210_cpufreq, cpu, tegra210_cpufreq_driver,
-    tegra210_cpufreq_devclass, NULL, NULL);
+DRIVER_MODULE(tegra210_cpufreq, cpu, tegra210_cpufreq_driver, NULL, NULL);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pinmux.c b/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
index d990ce729d39..855acf8ee923 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pinmux.c
@@ -750,8 +750,7 @@ static device_method_t tegra210_pinmux_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra210_pinmux_devclass;
 static DEFINE_CLASS_0(pinmux, tegra210_pinmux_driver, tegra210_pinmux_methods,
     sizeof(struct pinmux_softc));
 EARLY_DRIVER_MODULE(tegra210_pinmux, simplebus, tegra210_pinmux_driver,
-    tegra210_pinmux_devclass, NULL, NULL, 71);
+    NULL, NULL, 71);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_pmc.c b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
index 5ffa8cb97512..145804642aae 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_pmc.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_pmc.c
@@ -621,8 +621,7 @@ static device_method_t tegra210_pmc_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra210_pmc_devclass;
 static DEFINE_CLASS_0(pmc, tegra210_pmc_driver, tegra210_pmc_methods,
     sizeof(struct tegra210_pmc_softc));
-EARLY_DRIVER_MODULE(tegra210_pmc, simplebus, tegra210_pmc_driver,
-    tegra210_pmc_devclass, NULL, NULL, 70);
+EARLY_DRIVER_MODULE(tegra210_pmc, simplebus, tegra210_pmc_driver, NULL, NULL,
+    70);
diff --git a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
index 92e554b61bb4..63c28e48c60f 100644
--- a/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
+++ b/sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c
@@ -1954,8 +1954,7 @@ static device_method_t tegra_xusbpadctl_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t tegra_xusbpadctl_devclass;
 static DEFINE_CLASS_0(xusbpadctl, tegra_xusbpadctl_driver,
     tegra_xusbpadctl_methods, sizeof(struct padctl_softc));
 EARLY_DRIVER_MODULE(tegra_xusbpadctl, simplebus, tegra_xusbpadctl_driver,
-    tegra_xusbpadctl_devclass, NULL, NULL, 73);
+    NULL, NULL, 73);