diff --git a/sys/riscv/sifive/fe310_aon.c b/sys/riscv/sifive/fe310_aon.c
index a9819421852a..c4eff5dd8d84 100644
--- a/sys/riscv/sifive/fe310_aon.c
+++ b/sys/riscv/sifive/fe310_aon.c
@@ -313,6 +313,4 @@ static driver_t feaon_driver = {
 	sizeof(struct feaon_softc)
 };
 
-static devclass_t feaon_devclass;
-
-DRIVER_MODULE(fe310aon, simplebus, feaon_driver, feaon_devclass, 0, 0);
+DRIVER_MODULE(fe310aon, simplebus, feaon_driver, 0, 0);
diff --git a/sys/riscv/sifive/fu740_pci_dw.c b/sys/riscv/sifive/fu740_pci_dw.c
index fbb62cc44e65..e563150e77c3 100644
--- a/sys/riscv/sifive/fu740_pci_dw.c
+++ b/sys/riscv/sifive/fu740_pci_dw.c
@@ -460,6 +460,4 @@ static device_method_t fupci_methods[] = {
 
 DEFINE_CLASS_1(pcib, fupci_driver, fupci_methods,
     sizeof(struct fupci_softc), pci_dw_driver);
-static devclass_t fupci_devclass;
-DRIVER_MODULE(fu740_pci_dw, simplebus, fupci_driver, fupci_devclass,
-    NULL, NULL);
+DRIVER_MODULE(fu740_pci_dw, simplebus, fupci_driver, NULL, NULL);
diff --git a/sys/riscv/sifive/sifive_gpio.c b/sys/riscv/sifive/sifive_gpio.c
index 47d03ca448d5..c9a40cb08354 100644
--- a/sys/riscv/sifive/sifive_gpio.c
+++ b/sys/riscv/sifive/sifive_gpio.c
@@ -456,9 +456,8 @@ static device_method_t sfgpio_methods[] = {
 	DEVMETHOD_END
 };
 
-static devclass_t sfgpio_devclass;
 DEFINE_CLASS_0(gpio, sfgpio_driver, sfgpio_methods,
     sizeof(struct sfgpio_softc));
-EARLY_DRIVER_MODULE(gpio, simplebus, sfgpio_driver, sfgpio_devclass, 0, 0,
+EARLY_DRIVER_MODULE(gpio, simplebus, sfgpio_driver, 0, 0,
     BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
 MODULE_DEPEND(sfgpio, gpiobus, 1, 1, 1);
diff --git a/sys/riscv/sifive/sifive_prci.c b/sys/riscv/sifive/sifive_prci.c
index fee67bb153ac..dc3955027645 100644
--- a/sys/riscv/sifive/sifive_prci.c
+++ b/sys/riscv/sifive/sifive_prci.c
@@ -693,11 +693,9 @@ static driver_t prci_driver = {
 	sizeof(struct prci_softc)
 };
 
-static devclass_t prci_devclass;
-
 /*
  * hfclk and rtcclk appear later in the device tree than prci, so we must
  * attach late.
  */
-EARLY_DRIVER_MODULE(sifive_prci, simplebus, prci_driver, prci_devclass, 0, 0,
+EARLY_DRIVER_MODULE(sifive_prci, simplebus, prci_driver, 0, 0,
     BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
diff --git a/sys/riscv/sifive/sifive_spi.c b/sys/riscv/sifive/sifive_spi.c
index dd2cc3f58ee8..866a5418128d 100644
--- a/sys/riscv/sifive/sifive_spi.c
+++ b/sys/riscv/sifive/sifive_spi.c
@@ -398,8 +398,6 @@ static driver_t sfspi_driver = {
 	sizeof(struct sfspi_softc)
 };
 
-static devclass_t sfspi_devclass;
-
-DRIVER_MODULE(sifive_spi, simplebus, sfspi_driver, sfspi_devclass, 0, 0);
+DRIVER_MODULE(sifive_spi, simplebus, sfspi_driver, 0, 0);
 DRIVER_MODULE(ofw_spibus, sifive_spi, ofw_spibus_driver, 0, 0);
 MODULE_DEPEND(sifive_spi, ofw_spibus, 1, 1, 1);