git: 992ae60ba499 - main - powerpc powermac: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 10 May 2022 17:36:23 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=992ae60ba4990c3f963052a8e77b8caffbdcf354
commit 992ae60ba4990c3f963052a8e77b8caffbdcf354
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-10 17:21:38 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-10 17:21:38 +0000
powerpc powermac: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/powerpc/powermac/atibl.c | 4 +---
sys/powerpc/powermac/cpcht.c | 4 +---
sys/powerpc/powermac/cuda.c | 4 +---
sys/powerpc/powermac/fcu.c | 4 +---
sys/powerpc/powermac/grackle.c | 6 ++----
sys/powerpc/powermac/hrowpic.c | 4 +---
sys/powerpc/powermac/kiic.c | 5 ++---
sys/powerpc/powermac/macgpio.c | 5 +----
sys/powerpc/powermac/macio.c | 5 +----
sys/powerpc/powermac/nvbl.c | 4 +---
sys/powerpc/powermac/pmu.c | 11 +++--------
sys/powerpc/powermac/pswitch.c | 5 +----
sys/powerpc/powermac/smu.c | 13 ++++---------
sys/powerpc/powermac/smusat.c | 4 +---
sys/powerpc/powermac/tbgpio.c | 5 +----
sys/powerpc/powermac/uninorth.c | 5 +----
sys/powerpc/powermac/uninorthpci.c | 5 +----
sys/powerpc/powermac/vcoregpio.c | 4 +---
18 files changed, 25 insertions(+), 72 deletions(-)
diff --git a/sys/powerpc/powermac/atibl.c b/sys/powerpc/powermac/atibl.c
index ad78ff743436..89d339f871bf 100644
--- a/sys/powerpc/powermac/atibl.c
+++ b/sys/powerpc/powermac/atibl.c
@@ -101,9 +101,7 @@ static driver_t atibl_driver = {
sizeof(struct atibl_softc)
};
-static devclass_t atibl_devclass;
-
-DRIVER_MODULE(atibl, vgapci, atibl_driver, atibl_devclass, 0, 0);
+DRIVER_MODULE(atibl, vgapci, atibl_driver, 0, 0);
static void
atibl_identify(driver_t *driver, device_t parent)
diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c
index c4b658f2347a..e03f02477c16 100644
--- a/sys/powerpc/powermac/cpcht.c
+++ b/sys/powerpc/powermac/cpcht.c
@@ -138,11 +138,9 @@ struct cpcht_softc {
struct mtx htirq_mtx;
};
-static devclass_t cpcht_devclass;
DEFINE_CLASS_1(pcib, cpcht_driver, cpcht_methods, sizeof(struct cpcht_softc),
ofw_pcib_driver);
-EARLY_DRIVER_MODULE(cpcht, ofwbus, cpcht_driver, cpcht_devclass, 0, 0,
- BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(cpcht, ofwbus, cpcht_driver, 0, 0, BUS_PASS_BUS);
#define CPCHT_IOPORT_BASE 0xf4000000UL /* Hardwired */
#define CPCHT_IOPORT_SIZE 0x00400000UL
diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c
index 0feb197143f3..43888bc02b34 100644
--- a/sys/powerpc/powermac/cuda.c
+++ b/sys/powerpc/powermac/cuda.c
@@ -113,9 +113,7 @@ static driver_t cuda_driver = {
sizeof(struct cuda_softc),
};
-static devclass_t cuda_devclass;
-
-DRIVER_MODULE(cuda, macio, cuda_driver, cuda_devclass, 0, 0);
+DRIVER_MODULE(cuda, macio, cuda_driver, 0, 0);
DRIVER_MODULE(adb, cuda, adb_driver, 0, 0);
static void cuda_intr(void *arg);
diff --git a/sys/powerpc/powermac/fcu.c b/sys/powerpc/powermac/fcu.c
index b354e975f4d4..a129fe7dfae4 100644
--- a/sys/powerpc/powermac/fcu.c
+++ b/sys/powerpc/powermac/fcu.c
@@ -130,9 +130,7 @@ static driver_t fcu_driver = {
sizeof(struct fcu_softc)
};
-static devclass_t fcu_devclass;
-
-DRIVER_MODULE(fcu, iicbus, fcu_driver, fcu_devclass, 0, 0);
+DRIVER_MODULE(fcu, iicbus, fcu_driver, 0, 0);
static MALLOC_DEFINE(M_FCU, "fcu", "FCU Sensor Information");
static int
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index 06b5992e99a0..dc97d250f1ea 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -98,10 +98,9 @@ static device_method_t grackle_methods[] = {
DEVMETHOD_END
};
-static devclass_t grackle_devclass;
DEFINE_CLASS_1(pcib, grackle_driver, grackle_methods,
sizeof(struct grackle_softc), ofw_pcib_driver);
-DRIVER_MODULE(grackle, ofwbus, grackle_driver, grackle_devclass, 0, 0);
+DRIVER_MODULE(grackle, ofwbus, grackle_driver, 0, 0);
static int
grackle_probe(device_t dev)
@@ -317,6 +316,5 @@ static driver_t grackle_hb_driver = {
grackle_hb_methods,
1,
};
-static devclass_t grackle_hb_devclass;
-DRIVER_MODULE(grackle_hb, pci, grackle_hb_driver, grackle_hb_devclass, 0, 0);
+DRIVER_MODULE(grackle_hb, pci, grackle_hb_driver, 0, 0);
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index 6206304a59b8..53a2837e1e57 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -94,9 +94,7 @@ static driver_t hrowpic_driver = {
sizeof(struct hrowpic_softc)
};
-static devclass_t hrowpic_devclass;
-
-DRIVER_MODULE(hrowpic, macio, hrowpic_driver, hrowpic_devclass, 0, 0);
+DRIVER_MODULE(hrowpic, macio, hrowpic_driver, 0, 0);
static uint32_t
hrowpic_read_reg(struct hrowpic_softc *sc, u_int reg, u_int bank)
diff --git a/sys/powerpc/powermac/kiic.c b/sys/powerpc/powermac/kiic.c
index b08444763724..46981e5ecc29 100644
--- a/sys/powerpc/powermac/kiic.c
+++ b/sys/powerpc/powermac/kiic.c
@@ -145,10 +145,9 @@ static driver_t kiic_driver = {
kiic_methods,
sizeof(struct kiic_softc)
};
-static devclass_t kiic_devclass;
-DRIVER_MODULE(kiic, macio, kiic_driver, kiic_devclass, 0, 0);
-DRIVER_MODULE(kiic, unin, kiic_driver, kiic_devclass, 0, 0);
+DRIVER_MODULE(kiic, macio, kiic_driver, 0, 0);
+DRIVER_MODULE(kiic, unin, kiic_driver, 0, 0);
static int
kiic_probe(device_t self)
diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c
index a82888435163..2b0aa7f42f93 100644
--- a/sys/powerpc/powermac/macgpio.c
+++ b/sys/powerpc/powermac/macgpio.c
@@ -122,10 +122,7 @@ static driver_t macgpio_pci_driver = {
sizeof(struct macgpio_softc)
};
-devclass_t macgpio_devclass;
-
-EARLY_DRIVER_MODULE(macgpio, macio, macgpio_pci_driver, macgpio_devclass, 0, 0,
- BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(macgpio, macio, macgpio_pci_driver, 0, 0, BUS_PASS_BUS);
struct macgpio_devinfo {
struct ofw_bus_devinfo mdi_obdinfo;
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index 3e5007973726..23b72edf6e0d 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -139,10 +139,7 @@ static driver_t macio_pci_driver = {
sizeof(struct macio_softc)
};
-devclass_t macio_devclass;
-
-EARLY_DRIVER_MODULE(macio, pci, macio_pci_driver, macio_devclass, 0, 0,
- BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(macio, pci, macio_pci_driver, 0, 0, BUS_PASS_BUS);
/*
* PCI ID search table
diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c
index ba1f84badf94..aa13115b7cf2 100644
--- a/sys/powerpc/powermac/nvbl.c
+++ b/sys/powerpc/powermac/nvbl.c
@@ -79,9 +79,7 @@ static driver_t nvbl_driver = {
sizeof(struct nvbl_softc)
};
-static devclass_t nvbl_devclass;
-
-DRIVER_MODULE(nvbl, vgapci, nvbl_driver, nvbl_devclass, 0, 0);
+DRIVER_MODULE(nvbl, vgapci, nvbl_driver, 0, 0);
static void
nvbl_identify(driver_t *driver, device_t parent)
diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c
index 56194d85e7bb..984547f97b7b 100644
--- a/sys/powerpc/powermac/pmu.c
+++ b/sys/powerpc/powermac/pmu.c
@@ -154,10 +154,7 @@ static driver_t pmu_driver = {
sizeof(struct pmu_softc),
};
-static devclass_t pmu_devclass;
-
-EARLY_DRIVER_MODULE(pmu, macio, pmu_driver, pmu_devclass, 0, 0,
- BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(pmu, macio, pmu_driver, 0, 0, BUS_PASS_RESOURCE);
DRIVER_MODULE(adb, pmu, adb_driver, 0, 0);
static int pmuextint_probe(device_t);
@@ -176,10 +173,8 @@ static driver_t pmuextint_driver = {
0
};
-static devclass_t pmuextint_devclass;
-
-EARLY_DRIVER_MODULE(pmuextint, macgpio, pmuextint_driver, pmuextint_devclass,
- 0, 0, BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(pmuextint, macgpio, pmuextint_driver, 0, 0,
+ BUS_PASS_RESOURCE);
/* Make sure uhid is loaded, as it turns off some of the ADB emulation */
MODULE_DEPEND(pmu, usb, 1, 1, 1);
diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c
index e2da0f534188..a4712e67930c 100644
--- a/sys/powerpc/powermac/pswitch.c
+++ b/sys/powerpc/powermac/pswitch.c
@@ -70,10 +70,7 @@ static driver_t pswitch_driver = {
sizeof(struct pswitch_softc)
};
-static devclass_t pswitch_devclass;
-
-EARLY_DRIVER_MODULE(pswitch, macgpio, pswitch_driver, pswitch_devclass,
- 0, 0, BUS_PASS_RESOURCE);
+EARLY_DRIVER_MODULE(pswitch, macgpio, pswitch_driver, 0, 0, BUS_PASS_RESOURCE);
static int
pswitch_probe(device_t dev)
diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c
index 2981b89c59f2..b6c17783be61 100644
--- a/sys/powerpc/powermac/smu.c
+++ b/sys/powerpc/powermac/smu.c
@@ -213,9 +213,7 @@ static driver_t smu_driver = {
sizeof(struct smu_softc)
};
-static devclass_t smu_devclass;
-
-DRIVER_MODULE(smu, ofwbus, smu_driver, smu_devclass, 0, 0);
+DRIVER_MODULE(smu, ofwbus, smu_driver, 0, 0);
static MALLOC_DEFINE(M_SMU, "smu", "SMU Sensor Information");
#define SMU_MAILBOX 0x8000860c
@@ -631,10 +629,8 @@ static driver_t doorbell_driver = {
0
};
-static devclass_t doorbell_devclass;
-
-EARLY_DRIVER_MODULE(smudoorbell, macgpio, doorbell_driver, doorbell_devclass,
- 0, 0, BUS_PASS_SUPPORTDEV);
+EARLY_DRIVER_MODULE(smudoorbell, macgpio, doorbell_driver, 0, 0,
+ BUS_PASS_SUPPORTDEV);
static int
doorbell_probe(device_t dev)
@@ -1415,9 +1411,8 @@ static driver_t smuiic_driver = {
smuiic_methods,
sizeof(struct smuiic_softc)
};
-static devclass_t smuiic_devclass;
-DRIVER_MODULE(smuiic, smu, smuiic_driver, smuiic_devclass, 0, 0);
+DRIVER_MODULE(smuiic, smu, smuiic_driver, 0, 0);
static void
smu_attach_i2c(device_t smu, phandle_t i2croot)
diff --git a/sys/powerpc/powermac/smusat.c b/sys/powerpc/powermac/smusat.c
index a7df8b9227c8..bde472422fe5 100644
--- a/sys/powerpc/powermac/smusat.c
+++ b/sys/powerpc/powermac/smusat.c
@@ -88,9 +88,7 @@ static driver_t smusat_driver = {
sizeof(struct smusat_softc)
};
-static devclass_t smusat_devclass;
-
-DRIVER_MODULE(smusat, iicbus, smusat_driver, smusat_devclass, 0, 0);
+DRIVER_MODULE(smusat, iicbus, smusat_driver, 0, 0);
static int
smusat_probe(device_t dev)
diff --git a/sys/powerpc/powermac/tbgpio.c b/sys/powerpc/powermac/tbgpio.c
index 348a8d26b688..358a8f1c3352 100644
--- a/sys/powerpc/powermac/tbgpio.c
+++ b/sys/powerpc/powermac/tbgpio.c
@@ -61,10 +61,7 @@ static driver_t tbgpio_driver = {
sizeof(struct tbgpio_softc)
};
-static devclass_t tbgpio_devclass;
-
-EARLY_DRIVER_MODULE(tbgpio, macgpio, tbgpio_driver, tbgpio_devclass, 0, 0,
- BUS_PASS_CPU);
+EARLY_DRIVER_MODULE(tbgpio, macgpio, tbgpio_driver, 0, 0, BUS_PASS_CPU);
static int
tbgpio_probe(device_t dev)
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index 64371162a05f..832861ecf03d 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -135,8 +135,6 @@ static driver_t unin_chip_driver = {
sizeof(struct unin_chip_softc)
};
-static devclass_t unin_chip_devclass;
-
/*
* Assume there is only one unin chip in a PowerMac, so that pmu.c functions can
* suspend the chip after the whole rest of the device tree is suspended, not
@@ -144,8 +142,7 @@ static devclass_t unin_chip_devclass;
*/
static device_t unin_chip;
-EARLY_DRIVER_MODULE(unin, ofwbus, unin_chip_driver, unin_chip_devclass, 0, 0,
- BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(unin, ofwbus, unin_chip_driver, 0, 0, BUS_PASS_BUS);
/*
* Add an interrupt to the dev's resource list if present
diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c
index 508bcd29df0e..77e32981a64b 100644
--- a/sys/powerpc/powermac/uninorthpci.c
+++ b/sys/powerpc/powermac/uninorthpci.c
@@ -97,12 +97,9 @@ static device_method_t uninorth_methods[] = {
DEVMETHOD_END
};
-static devclass_t uninorth_devclass;
-
DEFINE_CLASS_1(pcib, uninorth_driver, uninorth_methods,
sizeof(struct uninorth_softc), ofw_pcib_driver);
-EARLY_DRIVER_MODULE(uninorth, ofwbus, uninorth_driver, uninorth_devclass, 0, 0,
- BUS_PASS_BUS);
+EARLY_DRIVER_MODULE(uninorth, ofwbus, uninorth_driver, 0, 0, BUS_PASS_BUS);
static int
uninorth_probe(device_t dev)
diff --git a/sys/powerpc/powermac/vcoregpio.c b/sys/powerpc/powermac/vcoregpio.c
index f2037f7b5039..37b534fe74bb 100644
--- a/sys/powerpc/powermac/vcoregpio.c
+++ b/sys/powerpc/powermac/vcoregpio.c
@@ -63,9 +63,7 @@ static driver_t vcoregpio_driver = {
0
};
-static devclass_t vcoregpio_devclass;
-
-DRIVER_MODULE(vcoregpio, macgpio, vcoregpio_driver, vcoregpio_devclass, 0, 0);
+DRIVER_MODULE(vcoregpio, macgpio, vcoregpio_driver, 0, 0);
static int
vcoregpio_probe(device_t dev)