git: 97a410130f1e - main - pci: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:24:38 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=97a410130f1eccd382455ec2515f8188c8c6cf64 commit 97a410130f1eccd382455ec2515f8188c8c6cf64 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-06 22:46:55 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:46:55 +0000 pci: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/pci/controller/pci_n1sdp.c | 5 +---- sys/dev/pci/fixup_pci.c | 4 +--- sys/dev/pci/hostb_pci.c | 4 +--- sys/dev/pci/ignore_pci.c | 4 +--- sys/dev/pci/pci.c | 4 +--- sys/dev/pci/pci_dw_mv.c | 4 +--- sys/dev/pci/pci_host_generic_acpi.c | 5 +---- sys/dev/pci/pci_host_generic_fdt.c | 8 ++------ sys/dev/pci/pci_pci.c | 5 +---- sys/dev/pci/vga_pci.c | 4 +--- 10 files changed, 11 insertions(+), 36 deletions(-) diff --git a/sys/dev/pci/controller/pci_n1sdp.c b/sys/dev/pci/controller/pci_n1sdp.c index 74d893ff1288..b153ebe4ee4c 100644 --- a/sys/dev/pci/controller/pci_n1sdp.c +++ b/sys/dev/pci/controller/pci_n1sdp.c @@ -361,7 +361,4 @@ static device_method_t n1sdp_pcie_acpi_methods[] = { DEFINE_CLASS_1(pcib, n1sdp_pcie_acpi_driver, n1sdp_pcie_acpi_methods, sizeof(struct generic_pcie_n1sdp_softc), generic_pcie_acpi_driver); -static devclass_t n1sdp_pcie_acpi_devclass; - -DRIVER_MODULE(n1sdp_pcib, acpi, n1sdp_pcie_acpi_driver, - n1sdp_pcie_acpi_devclass, 0, 0); +DRIVER_MODULE(n1sdp_pcib, acpi, n1sdp_pcie_acpi_driver, 0, 0); diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c index e4c64be3b30d..78a9bd2d71ae 100644 --- a/sys/dev/pci/fixup_pci.c +++ b/sys/dev/pci/fixup_pci.c @@ -68,9 +68,7 @@ static driver_t fixup_pci_driver = { 0, }; -static devclass_t fixup_pci_devclass; - -DRIVER_MODULE(fixup_pci, pci, fixup_pci_driver, fixup_pci_devclass, 0, 0); +DRIVER_MODULE(fixup_pci, pci, fixup_pci_driver, 0, 0); static int fixup_pci_probe(device_t dev) diff --git a/sys/dev/pci/hostb_pci.c b/sys/dev/pci/hostb_pci.c index 814805554dbe..c4ccc4b7a4b4 100644 --- a/sys/dev/pci/hostb_pci.c +++ b/sys/dev/pci/hostb_pci.c @@ -288,6 +288,4 @@ static driver_t pci_hostb_driver = { 1, }; -static devclass_t pci_hostb_devclass; - -DRIVER_MODULE(hostb, pci, pci_hostb_driver, pci_hostb_devclass, 0, 0); +DRIVER_MODULE(hostb, pci, pci_hostb_driver, 0, 0); diff --git a/sys/dev/pci/ignore_pci.c b/sys/dev/pci/ignore_pci.c index 5a24b87367ec..b9e7754e0695 100644 --- a/sys/dev/pci/ignore_pci.c +++ b/sys/dev/pci/ignore_pci.c @@ -57,9 +57,7 @@ static driver_t ignore_pci_driver = { 0, }; -static devclass_t ignore_pci_devclass; - -DRIVER_MODULE(ignore_pci, pci, ignore_pci_driver, ignore_pci_devclass, 0, 0); +DRIVER_MODULE(ignore_pci, pci, ignore_pci_driver, 0, 0); static int ignore_pci_probe(device_t dev) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 5a011bdd0c8f..57a47f21cd0b 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -226,9 +226,7 @@ static device_method_t pci_methods[] = { DEFINE_CLASS_0(pci, pci_driver, pci_methods, sizeof(struct pci_softc)); -static devclass_t pci_devclass; -EARLY_DRIVER_MODULE(pci, pcib, pci_driver, pci_devclass, pci_modevent, NULL, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(pci, pcib, pci_driver, pci_modevent, NULL, BUS_PASS_BUS); MODULE_VERSION(pci, 1); static char *pci_vendordata; diff --git a/sys/dev/pci/pci_dw_mv.c b/sys/dev/pci/pci_dw_mv.c index 43f45ddef54e..663d14e77d45 100644 --- a/sys/dev/pci/pci_dw_mv.c +++ b/sys/dev/pci/pci_dw_mv.c @@ -315,6 +315,4 @@ static device_method_t pci_mv_methods[] = { DEFINE_CLASS_1(pcib, pci_mv_driver, pci_mv_methods, sizeof(struct pci_mv_softc), pci_dw_driver); -static devclass_t pci_mv_devclass; -DRIVER_MODULE( pci_mv, simplebus, pci_mv_driver, pci_mv_devclass, - NULL, NULL); +DRIVER_MODULE( pci_mv, simplebus, pci_mv_driver, NULL, NULL); diff --git a/sys/dev/pci/pci_host_generic_acpi.c b/sys/dev/pci/pci_host_generic_acpi.c index 68c4100b588d..4a565c846339 100644 --- a/sys/dev/pci/pci_host_generic_acpi.c +++ b/sys/dev/pci/pci_host_generic_acpi.c @@ -489,7 +489,4 @@ static device_method_t generic_pcie_acpi_methods[] = { DEFINE_CLASS_1(pcib, generic_pcie_acpi_driver, generic_pcie_acpi_methods, sizeof(struct generic_pcie_acpi_softc), generic_pcie_core_driver); -static devclass_t generic_pcie_acpi_devclass; - -DRIVER_MODULE(pcib, acpi, generic_pcie_acpi_driver, generic_pcie_acpi_devclass, - 0, 0); +DRIVER_MODULE(pcib, acpi, generic_pcie_acpi_driver, 0, 0); diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c index 63abcecaa46f..ef0851afb76c 100644 --- a/sys/dev/pci/pci_host_generic_fdt.c +++ b/sys/dev/pci/pci_host_generic_fdt.c @@ -481,9 +481,5 @@ static device_method_t generic_pcie_fdt_methods[] = { DEFINE_CLASS_1(pcib, generic_pcie_fdt_driver, generic_pcie_fdt_methods, sizeof(struct generic_pcie_fdt_softc), generic_pcie_core_driver); -static devclass_t generic_pcie_fdt_devclass; - -DRIVER_MODULE(pcib, simplebus, generic_pcie_fdt_driver, - generic_pcie_fdt_devclass, 0, 0); -DRIVER_MODULE(pcib, ofwbus, generic_pcie_fdt_driver, generic_pcie_fdt_devclass, - 0, 0); +DRIVER_MODULE(pcib, simplebus, generic_pcie_fdt_driver, 0, 0); +DRIVER_MODULE(pcib, ofwbus, generic_pcie_fdt_driver, 0, 0); diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index 0945606bbc50..886279ae9340 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -133,11 +133,8 @@ static device_method_t pcib_methods[] = { DEVMETHOD_END }; -static devclass_t pcib_devclass; - DEFINE_CLASS_0(pcib, pcib_driver, pcib_methods, sizeof(struct pcib_softc)); -EARLY_DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, NULL, NULL, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(pcib, pci, pcib_driver, NULL, NULL, BUS_PASS_BUS); #if defined(NEW_PCIB) || defined(PCI_HP) SYSCTL_DECL(_hw_pci); diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c index 37334da00f80..a38f52d1bd12 100644 --- a/sys/dev/pci/vga_pci.c +++ b/sys/dev/pci/vga_pci.c @@ -787,7 +787,5 @@ static driver_t vga_pci_driver = { sizeof(struct vga_pci_softc), }; -static devclass_t vga_devclass; - -DRIVER_MODULE(vgapci, pci, vga_pci_driver, vga_devclass, 0, 0); +DRIVER_MODULE(vgapci, pci, vga_pci_driver, 0, 0); MODULE_DEPEND(vgapci, x86bios, 1, 1, 1);