git: badcc74fe956 - main - amd64: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:25:29 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=badcc74fe95655cda1878c6874d3dbd8a59a6d2e commit badcc74fe95655cda1878c6874d3dbd8a59a6d2e Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-06 22:46:59 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:46:59 +0000 amd64: Remove unused devclass arguments to DRIVER_MODULE. --- sys/amd64/acpica/acpi_machdep.c | 3 +-- sys/amd64/amd64/fpu.c | 4 +--- sys/amd64/vmm/amd/amdiommu.c | 4 +--- sys/amd64/vmm/amd/ivrs_drv.c | 5 +---- sys/amd64/vmm/io/ppt.c | 3 +-- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index a443c8693aa3..bbeb7cef44c5 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -286,6 +286,5 @@ static device_method_t nexus_acpi_methods[] = { }; DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); -static devclass_t nexus_devclass; -DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); +DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, 0, 0); diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 0bbf1cf047c0..dedb174dbe47 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -1060,9 +1060,7 @@ static driver_t fpupnp_driver = { 1, /* no softc */ }; -static devclass_t fpupnp_devclass; - -DRIVER_MODULE(fpupnp, acpi, fpupnp_driver, fpupnp_devclass, 0, 0); +DRIVER_MODULE(fpupnp, acpi, fpupnp_driver, 0, 0); ISA_PNP_INFO(fpupnp_ids); #endif /* DEV_ISA */ diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdiommu.c index 8dceb1aa241b..6b4349d1c160 100644 --- a/sys/amd64/vmm/amd/amdiommu.c +++ b/sys/amd64/vmm/amd/amdiommu.c @@ -178,8 +178,6 @@ ivhd_teardown_intr(device_t dev) return (0); } -static devclass_t amdiommu_devclass; - /* This driver has to be loaded before ivhd */ -DRIVER_MODULE(amdiommu, pci, amdiommu_driver, amdiommu_devclass, 0, 0); +DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0); MODULE_DEPEND(amdiommu, pci, 1, 1, 1); diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index a0b332e297b1..574c70cad383 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -754,12 +754,9 @@ static driver_t ivhd_driver = { sizeof(struct amdvi_softc), }; -static devclass_t ivhd_devclass; - /* * Load this module at the end after PCI re-probing to configure interrupt. */ -DRIVER_MODULE_ORDERED(ivhd, acpi, ivhd_driver, ivhd_devclass, 0, 0, - SI_ORDER_ANY); +DRIVER_MODULE_ORDERED(ivhd, acpi, ivhd_driver, 0, 0, SI_ORDER_ANY); MODULE_DEPEND(ivhd, acpi, 1, 1, 1); MODULE_DEPEND(ivhd, pci, 1, 1, 1); diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index a936326e8df3..6bcd8f78bbab 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -195,9 +195,8 @@ static device_method_t ppt_methods[] = { {0, 0} }; -static devclass_t ppt_devclass; DEFINE_CLASS_0(ppt, ppt_driver, ppt_methods, sizeof(struct pptdev)); -DRIVER_MODULE(ppt, pci, ppt_driver, ppt_devclass, NULL, NULL); +DRIVER_MODULE(ppt, pci, ppt_driver, NULL, NULL); static int ppt_find(struct vm *vm, int bus, int slot, int func, struct pptdev **pptp)