git: 07c15a9d3556 - main - ahci: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 22:42:57 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=07c15a9d35565d3862a7b3f02596b2e18e721f76 commit 07c15a9d35565d3862a7b3f02596b2e18e721f76 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-04-19 20:39:53 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:39:28 +0000 ahci: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/ahci/ahci.c | 3 +-- sys/dev/ahci/ahci_fsl_fdt.c | 7 ++----- sys/dev/ahci/ahci_generic.c | 8 ++------ sys/dev/ahci/ahciem.c | 3 +-- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c index 5f91b088b4bc..3fd119b2e10e 100644 --- a/sys/dev/ahci/ahci.c +++ b/sys/dev/ahci/ahci.c @@ -1056,7 +1056,6 @@ ahci_ch_resume(device_t dev) return (0); } -devclass_t ahcich_devclass; static device_method_t ahcich_methods[] = { DEVMETHOD(device_probe, ahci_ch_probe), DEVMETHOD(device_attach, ahci_ch_attach), @@ -1070,7 +1069,7 @@ static driver_t ahcich_driver = { ahcich_methods, sizeof(struct ahci_channel) }; -DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahcich_devclass, NULL, NULL); +DRIVER_MODULE(ahcich, ahci, ahcich_driver, NULL, NULL); struct ahci_dc_cb_args { bus_addr_t maddr; diff --git a/sys/dev/ahci/ahci_fsl_fdt.c b/sys/dev/ahci/ahci_fsl_fdt.c index 0fda9c28294b..b2caf24a5f45 100644 --- a/sys/dev/ahci/ahci_fsl_fdt.c +++ b/sys/dev/ahci/ahci_fsl_fdt.c @@ -417,8 +417,5 @@ static driver_t ahci_fsl_fdt_driver = { sizeof(struct ahci_fsl_fdt_controller), }; -static devclass_t ahci_fsl_fdt_devclass; -DRIVER_MODULE(ahci_fsl, simplebus, ahci_fsl_fdt_driver, ahci_fsl_fdt_devclass, - NULL, NULL); -DRIVER_MODULE(ahci_fsl, ofwbus, ahci_fsl_fdt_driver, ahci_fsl_fdt_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_fsl, simplebus, ahci_fsl_fdt_driver, NULL, NULL); +DRIVER_MODULE(ahci_fsl, ofwbus, ahci_fsl_fdt_driver, NULL, NULL); diff --git a/sys/dev/ahci/ahci_generic.c b/sys/dev/ahci/ahci_generic.c index 108aaa2adf3a..ab571f0313b6 100644 --- a/sys/dev/ahci/ahci_generic.c +++ b/sys/dev/ahci/ahci_generic.c @@ -172,7 +172,6 @@ ahci_gen_detach(device_t dev) } #ifdef FDT -static devclass_t ahci_gen_fdt_devclass; static device_method_t ahci_fdt_methods[] = { DEVMETHOD(device_probe, ahci_fdt_probe), DEVMETHOD(device_attach, ahci_gen_attach), @@ -191,12 +190,10 @@ static driver_t ahci_fdt_driver = { ahci_fdt_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci_fdt, simplebus, ahci_fdt_driver, ahci_gen_fdt_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_fdt, simplebus, ahci_fdt_driver, NULL, NULL); #endif #ifdef DEV_ACPI -static devclass_t ahci_gen_acpi_devclass; static device_method_t ahci_acpi_methods[] = { DEVMETHOD(device_probe, ahci_acpi_probe), DEVMETHOD(device_attach, ahci_gen_attach), @@ -215,6 +212,5 @@ static driver_t ahci_acpi_driver = { ahci_acpi_methods, sizeof(struct ahci_controller) }; -DRIVER_MODULE(ahci_acpi, acpi, ahci_acpi_driver, ahci_gen_acpi_devclass, - NULL, NULL); +DRIVER_MODULE(ahci_acpi, acpi, ahci_acpi_driver, NULL, NULL); #endif diff --git a/sys/dev/ahci/ahciem.c b/sys/dev/ahci/ahciem.c index 20b36830ce9a..de4b5ba9000e 100644 --- a/sys/dev/ahci/ahciem.c +++ b/sys/dev/ahci/ahciem.c @@ -274,7 +274,6 @@ ahci_em_resume(device_t dev) return (0); } -devclass_t ahciem_devclass; static device_method_t ahciem_methods[] = { DEVMETHOD(device_probe, ahci_em_probe), DEVMETHOD(device_attach, ahci_em_attach), @@ -288,7 +287,7 @@ static driver_t ahciem_driver = { ahciem_methods, sizeof(struct ahci_enclosure) }; -DRIVER_MODULE(ahciem, ahci, ahciem_driver, ahciem_devclass, NULL, NULL); +DRIVER_MODULE(ahciem, ahci, ahciem_driver, NULL, NULL); static void ahci_em_setleds(device_t dev, int c)