git: 354f6c1cc1ee - main - mfi: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 22:43:41 UTC
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=354f6c1cc1ee0bf109a9134f918105e63b59c8d4 commit 354f6c1cc1ee0bf109a9134f918105e63b59c8d4 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-04-20 16:49:22 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:39:31 +0000 mfi: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/mfi/mfi_cam.c | 5 +++-- sys/dev/mfi/mfi_disk.c | 4 +--- sys/dev/mfi/mfi_pci.c | 4 +--- sys/dev/mfi/mfi_syspd.c | 4 +--- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/dev/mfi/mfi_cam.c b/sys/dev/mfi/mfi_cam.c index fdbfaaf08250..b32f7e52068c 100644 --- a/sys/dev/mfi/mfi_cam.c +++ b/sys/dev/mfi/mfi_cam.c @@ -94,7 +94,6 @@ static int mfi_allow_disks = 0; SYSCTL_INT(_hw_mfi, OID_AUTO, allow_cam_disk_passthrough, CTLFLAG_RDTUN, &mfi_allow_disks, 0, "event message locale"); -static devclass_t mfip_devclass; static device_method_t mfip_methods[] = { DEVMETHOD(device_probe, mfip_probe), DEVMETHOD(device_attach, mfip_attach), @@ -102,12 +101,14 @@ static device_method_t mfip_methods[] = { DEVMETHOD_END }; + static driver_t mfip_driver = { "mfip", mfip_methods, sizeof(struct mfip_softc) }; -DRIVER_MODULE(mfip, mfi, mfip_driver, mfip_devclass, 0, 0); + +DRIVER_MODULE(mfip, mfi, mfip_driver, 0, 0); MODULE_DEPEND(mfip, cam, 1, 1, 1); MODULE_DEPEND(mfip, mfi, 1, 1, 1); diff --git a/sys/dev/mfi/mfi_disk.c b/sys/dev/mfi/mfi_disk.c index e1f1420d5676..277144f36ef8 100644 --- a/sys/dev/mfi/mfi_disk.c +++ b/sys/dev/mfi/mfi_disk.c @@ -68,8 +68,6 @@ static disk_close_t mfi_disk_close; static disk_strategy_t mfi_disk_strategy; static dumper_t mfi_disk_dump; -static devclass_t mfi_disk_devclass; - static device_method_t mfi_disk_methods[] = { DEVMETHOD(device_probe, mfi_disk_probe), DEVMETHOD(device_attach, mfi_disk_attach), @@ -83,7 +81,7 @@ static driver_t mfi_disk_driver = { sizeof(struct mfi_disk) }; -DRIVER_MODULE(mfid, mfi, mfi_disk_driver, mfi_disk_devclass, 0, 0); +DRIVER_MODULE(mfid, mfi, mfi_disk_driver, 0, 0); static int mfi_disk_probe(device_t dev) diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 90e78aeaf509..57922fc6138e 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -108,8 +108,6 @@ static driver_t mfi_pci_driver = { sizeof(struct mfi_softc) }; -static devclass_t mfi_devclass; - static int mfi_msi = 1; SYSCTL_INT(_hw_mfi, OID_AUTO, msi, CTLFLAG_RDTUN, &mfi_msi, 0, "Enable use of MSI interrupts"); @@ -161,7 +159,7 @@ struct mfi_ident { {0, 0, 0, 0, 0, NULL} }; -DRIVER_MODULE(mfi, pci, mfi_pci_driver, mfi_devclass, 0, 0); +DRIVER_MODULE(mfi, pci, mfi_pci_driver, 0, 0); MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, mfi, mfi_identifiers, nitems(mfi_identifiers) - 1); MODULE_VERSION(mfi, 1); diff --git a/sys/dev/mfi/mfi_syspd.c b/sys/dev/mfi/mfi_syspd.c index ba090e744ee1..542df25aea3d 100644 --- a/sys/dev/mfi/mfi_syspd.c +++ b/sys/dev/mfi/mfi_syspd.c @@ -73,8 +73,6 @@ static disk_close_t mfi_syspd_close; static disk_strategy_t mfi_syspd_strategy; static dumper_t mfi_syspd_dump; -static devclass_t mfi_syspd_devclass; - static device_method_t mfi_syspd_methods[] = { DEVMETHOD(device_probe, mfi_syspd_probe), DEVMETHOD(device_attach, mfi_syspd_attach), @@ -88,7 +86,7 @@ static driver_t mfi_syspd_driver = { sizeof(struct mfi_system_pd) }; -DRIVER_MODULE(mfisyspd, mfi, mfi_syspd_driver, mfi_syspd_devclass, 0, 0); +DRIVER_MODULE(mfisyspd, mfi, mfi_syspd_driver, 0, 0); static int mfi_syspd_probe(device_t dev)