git: 03f6459cb3c0 - main - ofw drivers: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 09 May 2022 21:47:42 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=03f6459cb3c085f0d03419822d60bd7961a97f09 commit 03f6459cb3c085f0d03419822d60bd7961a97f09 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-09 21:26:44 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-09 21:26:44 +0000 ofw drivers: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/ofw/ofw_cpu.c | 9 ++------- sys/dev/ofw/ofw_pci.c | 4 +--- sys/dev/ofw/ofwbus.c | 3 +-- sys/powerpc/ofw/ofw_pcib_pci.c | 5 +---- sys/powerpc/ofw/ofw_pcibus.c | 5 +---- sys/powerpc/ofw/ofw_syscons.c | 4 +--- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index c16973373acd..f7bfc10b7b73 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -86,10 +86,7 @@ static driver_t ofw_cpulist_driver = { sizeof(struct ofw_cpulist_softc) }; -static devclass_t ofw_cpulist_devclass; - -DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, ofw_cpulist_devclass, - 0, 0); +DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, 0, 0); static int ofw_cpulist_probe(device_t dev) @@ -183,9 +180,7 @@ static driver_t ofw_cpu_driver = { sizeof(struct ofw_cpu_softc) }; -static devclass_t ofw_cpu_devclass; - -DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, ofw_cpu_devclass, 0, 0); +DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, 0, 0); static int ofw_cpu_probe(device_t dev) diff --git a/sys/dev/ofw/ofw_pci.c b/sys/dev/ofw/ofw_pci.c index 4bd6ccd64420..9434bd54f8d9 100644 --- a/sys/dev/ofw/ofw_pci.c +++ b/sys/dev/ofw/ofw_pci.c @@ -63,11 +63,9 @@ static device_method_t ofw_pci_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; - DEFINE_CLASS_1(pci, ofw_pci_driver, ofw_pci_methods, sizeof(struct pci_softc), pci_driver); -DRIVER_MODULE(ofw_pci, pcib, ofw_pci_driver, pci_devclass, 0, 0); +DRIVER_MODULE(ofw_pci, pcib, ofw_pci_driver, 0, 0); MODULE_DEPEND(ofw_pci, simplebus, 1, 1, 1); MODULE_DEPEND(ofw_pci, pci, 1, 1, 1); MODULE_VERSION(ofw_pci, 1); diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 2a28a928e15e..a64f03b8099a 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -99,8 +99,7 @@ static device_method_t ofwbus_methods[] = { DEFINE_CLASS_1(ofwbus, ofwbus_driver, ofwbus_methods, sizeof(struct ofwbus_softc), simplebus_driver); -static devclass_t ofwbus_devclass; -EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0, +EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(ofwbus, 1); diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c index c39df7f43814..77f83d7d996a 100644 --- a/sys/powerpc/ofw/ofw_pcib_pci.c +++ b/sys/powerpc/ofw/ofw_pcib_pci.c @@ -71,8 +71,6 @@ static device_method_t ofw_pcib_pci_methods[] = { DEVMETHOD_END }; -static devclass_t pcib_devclass; - struct ofw_pcib_softc { /* * This is here so that we can use pci bridge methods, too - the @@ -86,8 +84,7 @@ struct ofw_pcib_softc { DEFINE_CLASS_1(pcib, ofw_pcib_pci_driver, ofw_pcib_pci_methods, sizeof(struct ofw_pcib_softc), pcib_driver); -EARLY_DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, pcib_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, 0, 0, BUS_PASS_BUS); static int ofw_pcib_pci_probe(device_t dev) diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c index cdda3ee779f4..c0e99817888b 100644 --- a/sys/powerpc/ofw/ofw_pcibus.c +++ b/sys/powerpc/ofw/ofw_pcibus.c @@ -100,12 +100,9 @@ static device_method_t ofw_pcibus_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; - DEFINE_CLASS_1(pci, ofw_pcibus_driver, ofw_pcibus_methods, sizeof(struct pci_softc), pci_driver); -EARLY_DRIVER_MODULE(ofw_pcibus, pcib, ofw_pcibus_driver, pci_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_pcibus, pcib, ofw_pcibus_driver, 0, 0, BUS_PASS_BUS); MODULE_VERSION(ofw_pcibus, 1); MODULE_DEPEND(ofw_pcibus, pci, 1, 1, 1); diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c index 633750e1351c..f49230464a36 100644 --- a/sys/powerpc/ofw/ofw_syscons.c +++ b/sys/powerpc/ofw/ofw_syscons.c @@ -1044,9 +1044,7 @@ static driver_t ofwfb_sc_driver = { sizeof(sc_softc_t), }; -static devclass_t sc_devclass; - -DRIVER_MODULE(ofwfb, nexus, ofwfb_sc_driver, sc_devclass, 0, 0); +DRIVER_MODULE(ofwfb, nexus, ofwfb_sc_driver, 0, 0); /* * Utility routines from <dev/fb/fbreg.h>