From 94412ad7d94f94c4850fa1370e456dc8c735e7c6 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Mon, 9 May 2022 14:26:46 -0700 Subject: [PATCH] vnic: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/vnic/mrml_bridge.c | 4 +--- sys/dev/vnic/nic_main.c | 4 +--- sys/dev/vnic/nicvf_main.c | 4 +--- sys/dev/vnic/thunder_bgx.c | 4 +--- sys/dev/vnic/thunder_mdio_fdt.c | 16 ++++++---------- 5 files changed, 10 insertions(+), 22 deletions(-) diff --git a/sys/dev/vnic/mrml_bridge.c b/sys/dev/vnic/mrml_bridge.c index 7f4dc128ca11..d3b9851b5067 100644 --- a/sys/dev/vnic/mrml_bridge.c +++ b/sys/dev/vnic/mrml_bridge.c @@ -81,9 +81,7 @@ static device_method_t mrmlbus_fdt_methods[] = { DEFINE_CLASS_0(mrmlbus, mrmlbus_fdt_driver, mrmlbus_fdt_methods, sizeof(struct simplebus_softc)); -static devclass_t mrmlbus_fdt_devclass; - -EARLY_DRIVER_MODULE(mrmlbus, pcib, mrmlbus_fdt_driver, mrmlbus_fdt_devclass, 0, 0, +EARLY_DRIVER_MODULE(mrmlbus, pcib, mrmlbus_fdt_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(mrmlbus, 1); diff --git a/sys/dev/vnic/nic_main.c b/sys/dev/vnic/nic_main.c index 08559442dbc7..575fa86ffac6 100644 --- a/sys/dev/vnic/nic_main.c +++ b/sys/dev/vnic/nic_main.c @@ -155,9 +155,7 @@ static driver_t vnicpf_driver = { sizeof(struct nicpf), }; -static devclass_t vnicpf_devclass; - -DRIVER_MODULE(vnicpf, pci, vnicpf_driver, vnicpf_devclass, 0, 0); +DRIVER_MODULE(vnicpf, pci, vnicpf_driver, 0, 0); MODULE_VERSION(vnicpf, 1); MODULE_DEPEND(vnicpf, pci, 1, 1, 1); MODULE_DEPEND(vnicpf, ether, 1, 1, 1); diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c index 0794c7d53113..54efc58fee22 100644 --- a/sys/dev/vnic/nicvf_main.c +++ b/sys/dev/vnic/nicvf_main.c @@ -127,9 +127,7 @@ static driver_t nicvf_driver = { sizeof(struct nicvf), }; -static devclass_t nicvf_devclass; - -DRIVER_MODULE(vnicvf, pci, nicvf_driver, nicvf_devclass, 0, 0); +DRIVER_MODULE(vnicvf, pci, nicvf_driver, 0, 0); MODULE_VERSION(vnicvf, 1); MODULE_DEPEND(vnicvf, pci, 1, 1, 1); MODULE_DEPEND(vnicvf, ether, 1, 1, 1); diff --git a/sys/dev/vnic/thunder_bgx.c b/sys/dev/vnic/thunder_bgx.c index b2479d2dcd42..ba4cbc8c9a2b 100644 --- a/sys/dev/vnic/thunder_bgx.c +++ b/sys/dev/vnic/thunder_bgx.c @@ -106,9 +106,7 @@ static driver_t thunder_bgx_driver = { sizeof(struct lmac), }; -static devclass_t thunder_bgx_devclass; - -DRIVER_MODULE(thunder_bgx, pci, thunder_bgx_driver, thunder_bgx_devclass, 0, 0); +DRIVER_MODULE(thunder_bgx, pci, thunder_bgx_driver, 0, 0); MODULE_VERSION(thunder_bgx, 1); MODULE_DEPEND(thunder_bgx, pci, 1, 1, 1); MODULE_DEPEND(thunder_bgx, ether, 1, 1, 1); diff --git a/sys/dev/vnic/thunder_mdio_fdt.c b/sys/dev/vnic/thunder_mdio_fdt.c index 4012950255ee..fd3905453008 100644 --- a/sys/dev/vnic/thunder_mdio_fdt.c +++ b/sys/dev/vnic/thunder_mdio_fdt.c @@ -59,12 +59,10 @@ static device_method_t thunder_mdio_fdt_methods[] = { DEFINE_CLASS_1(thunder_mdio, thunder_mdio_fdt_driver, thunder_mdio_fdt_methods, sizeof(struct thunder_mdio_softc), thunder_mdio_driver); -static devclass_t thunder_mdio_fdt_devclass; - -EARLY_DRIVER_MODULE(thunder_mdio, ofwbus, thunder_mdio_fdt_driver, - thunder_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); -EARLY_DRIVER_MODULE(thunder_mdio, mdionexus, thunder_mdio_fdt_driver, - thunder_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(thunder_mdio, ofwbus, thunder_mdio_fdt_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(thunder_mdio, mdionexus, thunder_mdio_fdt_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); static struct ofw_compat_data mdio_compat_data[] = { {"cavium,octeon-3860-mdio", true}, @@ -140,10 +138,8 @@ static device_method_t mdionexus_fdt_methods[] = { DEFINE_CLASS_0(mdionexus, mdionexus_fdt_driver, mdionexus_fdt_methods, sizeof(struct mdionexus_softc)); -static devclass_t mdionexus_fdt_devclass; - -EARLY_DRIVER_MODULE(mdionexus, mrmlbus, mdionexus_fdt_driver, - mdionexus_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(mdionexus, mrmlbus, mdionexus_fdt_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); static int mdionexus_ofw_fill_ranges(phandle_t, struct simplebus_softc *); static int mdionexus_ofw_bus_attach(device_t);