git: f929eb1ed50f - main - xen: Remove unused devclass arguments to DRIVER_MODULE.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 06 May 2022 23:25:14 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=f929eb1ed50f079f1638cdabe511ac2e347f541a
commit f929eb1ed50f079f1638cdabe511ac2e347f541a
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-05-06 22:46:58 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-05-06 22:46:58 +0000
xen: Remove unused devclass arguments to DRIVER_MODULE.
---
sys/dev/xen/balloon/balloon.c | 4 +---
sys/dev/xen/blkback/blkback.c | 3 +--
sys/dev/xen/blkfront/blkfront.c | 3 +--
sys/dev/xen/bus/xenpv.c | 4 +---
sys/dev/xen/console/xen_console.c | 4 +---
sys/dev/xen/control/control.c | 3 +--
sys/dev/xen/cpu/xen_acpi_cpu.c | 3 +--
sys/dev/xen/debug/debug.c | 4 +---
sys/dev/xen/evtchn/evtchn_dev.c | 4 +---
sys/dev/xen/gntdev/gntdev.c | 4 +---
sys/dev/xen/grant_table/grant_table.c | 5 ++---
sys/dev/xen/netback/netback.c | 3 +--
sys/dev/xen/netfront/netfront.c | 4 +---
sys/dev/xen/privcmd/privcmd.c | 4 +---
sys/dev/xen/timer/timer.c | 4 +---
sys/dev/xen/xenpci/xenpci.c | 7 +------
sys/dev/xen/xenstore/xenstore.c | 3 +--
sys/dev/xen/xenstore/xenstore_dev.c | 4 +---
sys/dev/xen/xenstore/xenstored_dev.c | 4 +---
sys/xen/xenbus/xenbusb_back.c | 4 +---
sys/xen/xenbus/xenbusb_front.c | 4 +---
21 files changed, 22 insertions(+), 60 deletions(-)
diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c
index 7e97fa144485..9fb3164cab7a 100644
--- a/sys/dev/xen/balloon/balloon.c
+++ b/sys/dev/xen/balloon/balloon.c
@@ -408,7 +408,5 @@ static device_method_t xenballoon_methods[] = {
};
DEFINE_CLASS_0(xenballoon, xenballoon_driver, xenballoon_methods, 0);
-devclass_t xenballoon_devclass;
-DRIVER_MODULE(xenballoon, xenstore, xenballoon_driver, xenballoon_devclass,
- NULL, NULL);
+DRIVER_MODULE(xenballoon, xenstore, xenballoon_driver, NULL, NULL);
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index 33414295bf5e..e32236d507f3 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -3954,6 +3954,5 @@ static driver_t xbb_driver = {
xbb_methods,
sizeof(struct xbb_softc),
};
-devclass_t xbb_devclass;
-DRIVER_MODULE(xbbd, xenbusb_back, xbb_driver, xbb_devclass, 0, 0);
+DRIVER_MODULE(xbbd, xenbusb_back, xbb_driver, 0, 0);
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index 3219c26222aa..87054a4d1240 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -1646,6 +1646,5 @@ static driver_t xbd_driver = {
xbd_methods,
sizeof(struct xbd_softc),
};
-devclass_t xbd_devclass;
-DRIVER_MODULE(xbd, xenbusb_front, xbd_driver, xbd_devclass, 0, 0);
+DRIVER_MODULE(xbd, xenbusb_front, xbd_driver, 0, 0);
diff --git a/sys/dev/xen/bus/xenpv.c b/sys/dev/xen/bus/xenpv.c
index 7727c1caccee..3d1d1025b736 100644
--- a/sys/dev/xen/bus/xenpv.c
+++ b/sys/dev/xen/bus/xenpv.c
@@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$");
#define LOW_MEM_LIMIT 0
#endif
-static devclass_t xenpv_devclass;
-
static void
xenpv_identify(driver_t *driver, device_t parent)
{
@@ -186,7 +184,7 @@ static driver_t xenpv_driver = {
0,
};
-DRIVER_MODULE(xenpv, nexus, xenpv_driver, xenpv_devclass, 0, 0);
+DRIVER_MODULE(xenpv, nexus, xenpv_driver, 0, 0);
struct resource *
xenmem_alloc(device_t dev, int *res_id, size_t size)
diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c
index 27da02723dc3..cec97a837b50 100644
--- a/sys/dev/xen/console/xen_console.c
+++ b/sys/dev/xen/console/xen_console.c
@@ -771,8 +771,6 @@ xencons_resume(device_t dev)
return (0);
}
-static devclass_t xencons_devclass;
-
static device_method_t xencons_methods[] = {
DEVMETHOD(device_identify, xencons_identify),
DEVMETHOD(device_probe, xencons_probe),
@@ -788,4 +786,4 @@ static driver_t xencons_driver = {
0,
};
-DRIVER_MODULE(xc, xenpv, xencons_driver, xencons_devclass, 0, 0);
+DRIVER_MODULE(xc, xenpv, xencons_driver, 0, 0);
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index 903864d84598..2a539c724046 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -487,6 +487,5 @@ static device_method_t xctrl_methods[] = {
};
DEFINE_CLASS_0(xctrl, xctrl_driver, xctrl_methods, sizeof(struct xctrl_softc));
-devclass_t xctrl_devclass;
-DRIVER_MODULE(xctrl, xenstore, xctrl_driver, xctrl_devclass, NULL, NULL);
+DRIVER_MODULE(xctrl, xenstore, xctrl_driver, NULL, NULL);
diff --git a/sys/dev/xen/cpu/xen_acpi_cpu.c b/sys/dev/xen/cpu/xen_acpi_cpu.c
index 865bac49b869..724634b9fa5f 100644
--- a/sys/dev/xen/cpu/xen_acpi_cpu.c
+++ b/sys/dev/xen/cpu/xen_acpi_cpu.c
@@ -600,6 +600,5 @@ static driver_t xen_acpi_cpu_driver = {
sizeof(struct xen_acpi_cpu_softc),
};
-static devclass_t xen_acpi_cpu_devclass;
-DRIVER_MODULE(xen_cpu, acpi, xen_acpi_cpu_driver, xen_acpi_cpu_devclass, 0, 0);
+DRIVER_MODULE(xen_cpu, acpi, xen_acpi_cpu_driver, 0, 0);
MODULE_DEPEND(xen_cpu, acpi, 1, 1, 1);
diff --git a/sys/dev/xen/debug/debug.c b/sys/dev/xen/debug/debug.c
index bd1d6101f392..d05e69f107c3 100644
--- a/sys/dev/xen/debug/debug.c
+++ b/sys/dev/xen/debug/debug.c
@@ -150,7 +150,5 @@ static driver_t xendebug_driver = {
0,
};
-devclass_t xendebug_devclass;
-
-DRIVER_MODULE(xendebug, xenpv, xendebug_driver, xendebug_devclass, 0, 0);
+DRIVER_MODULE(xendebug, xenpv, xendebug_driver, 0, 0);
MODULE_DEPEND(xendebug, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/evtchn/evtchn_dev.c b/sys/dev/xen/evtchn/evtchn_dev.c
index c970404cce3c..34f481358008 100644
--- a/sys/dev/xen/evtchn/evtchn_dev.c
+++ b/sys/dev/xen/evtchn/evtchn_dev.c
@@ -599,7 +599,5 @@ static driver_t evtchn_driver = {
0,
};
-devclass_t evtchn_devclass;
-
-DRIVER_MODULE(evtchn, xenpv, evtchn_driver, evtchn_devclass, 0, 0);
+DRIVER_MODULE(evtchn, xenpv, evtchn_driver, 0, 0);
MODULE_DEPEND(evtchn, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/gntdev/gntdev.c b/sys/dev/xen/gntdev/gntdev.c
index 0c89133ca1b0..75191bea1fd1 100644
--- a/sys/dev/xen/gntdev/gntdev.c
+++ b/sys/dev/xen/gntdev/gntdev.c
@@ -1276,7 +1276,5 @@ static driver_t gntdev_driver = {
0,
};
-devclass_t gntdev_devclass;
-
-DRIVER_MODULE(gntdev, xenpv, gntdev_driver, gntdev_devclass, 0, 0);
+DRIVER_MODULE(gntdev, xenpv, gntdev_driver, 0, 0);
MODULE_DEPEND(gntdev, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/grant_table/grant_table.c b/sys/dev/xen/grant_table/grant_table.c
index a3f9f449e4a3..11e5071c7b0b 100644
--- a/sys/dev/xen/grant_table/grant_table.c
+++ b/sys/dev/xen/grant_table/grant_table.c
@@ -675,7 +675,6 @@ static device_method_t granttable_methods[] = {
};
DEFINE_CLASS_0(granttable, granttable_driver, granttable_methods, 0);
-devclass_t granttable_devclass;
-DRIVER_MODULE_ORDERED(granttable, xenpv, granttable_driver, granttable_devclass,
- NULL, NULL, SI_ORDER_FIRST);
+DRIVER_MODULE_ORDERED(granttable, xenpv, granttable_driver, NULL, NULL,
+ SI_ORDER_FIRST);
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index bcc7d2541203..ddd5218a8936 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -2495,9 +2495,8 @@ static driver_t xnb_driver = {
xnb_methods,
sizeof(struct xnb_softc),
};
-devclass_t xnb_devclass;
-DRIVER_MODULE(xnb, xenbusb_back, xnb_driver, xnb_devclass, 0, 0);
+DRIVER_MODULE(xnb, xenbusb_back, xnb_driver, 0, 0);
/*-------------------------- Unit Tests -------------------------------------*/
#ifdef XNB_DEBUG
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index facab6550ca3..fc151453a49a 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -2336,7 +2336,5 @@ static driver_t netfront_driver = {
netfront_methods,
sizeof(struct netfront_info),
};
-devclass_t netfront_devclass;
-DRIVER_MODULE(xe, xenbusb_front, netfront_driver, netfront_devclass, NULL,
- NULL);
+DRIVER_MODULE(xe, xenbusb_front, netfront_driver, NULL, NULL);
diff --git a/sys/dev/xen/privcmd/privcmd.c b/sys/dev/xen/privcmd/privcmd.c
index f8da2e2d9a35..459ac8bbe951 100644
--- a/sys/dev/xen/privcmd/privcmd.c
+++ b/sys/dev/xen/privcmd/privcmd.c
@@ -607,7 +607,5 @@ static driver_t privcmd_driver = {
0,
};
-devclass_t privcmd_devclass;
-
-DRIVER_MODULE(privcmd, xenpv, privcmd_driver, privcmd_devclass, 0, 0);
+DRIVER_MODULE(privcmd, xenpv, privcmd_driver, 0, 0);
MODULE_DEPEND(privcmd, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index 527259f6720f..815e3338f320 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -68,8 +68,6 @@ __FBSDID("$FreeBSD$");
#include "clock_if.h"
-static devclass_t xentimer_devclass;
-
#define NSEC_IN_SEC 1000000000ULL
#define NSEC_IN_USEC 1000ULL
/* 18446744073 = int(2^64 / NSEC_IN_SC) = 1 ns in 64-bit fractions */
@@ -555,5 +553,5 @@ static driver_t xentimer_driver = {
sizeof(struct xentimer_softc),
};
-DRIVER_MODULE(xentimer, xenpv, xentimer_driver, xentimer_devclass, 0, 0);
+DRIVER_MODULE(xentimer, xenpv, xentimer_driver, 0, 0);
MODULE_DEPEND(xentimer, xenpv, 1, 1, 1);
diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c
index 07d424c1e7a7..ca54b691b8ad 100644
--- a/sys/dev/xen/xenpci/xenpci.c
+++ b/sys/dev/xen/xenpci/xenpci.c
@@ -52,11 +52,6 @@ __FBSDID("$FreeBSD$");
#include <dev/xen/xenpci/xenpcivar.h>
-/*
- * This is used to find our platform device instance.
- */
-static devclass_t xenpci_devclass;
-
static int
xenpci_intr_filter(void *trap_frame)
{
@@ -236,4 +231,4 @@ static driver_t xenpci_driver = {
sizeof(struct xenpci_softc),
};
-DRIVER_MODULE(xenpci, pci, xenpci_driver, xenpci_devclass, 0, 0);
+DRIVER_MODULE(xenpci, pci, xenpci_driver, 0, 0);
diff --git a/sys/dev/xen/xenstore/xenstore.c b/sys/dev/xen/xenstore/xenstore.c
index 534cb65ca152..e99f48d8d0d7 100644
--- a/sys/dev/xen/xenstore/xenstore.c
+++ b/sys/dev/xen/xenstore/xenstore.c
@@ -1237,9 +1237,8 @@ static device_method_t xenstore_methods[] = {
};
DEFINE_CLASS_0(xenstore, xenstore_driver, xenstore_methods, 0);
-static devclass_t xenstore_devclass;
-DRIVER_MODULE(xenstore, xenpv, xenstore_driver, xenstore_devclass, 0, 0);
+DRIVER_MODULE(xenstore, xenpv, xenstore_driver, 0, 0);
/*------------------------------- Sysctl Data --------------------------------*/
/* XXX Shouldn't the node be somewhere else? */
diff --git a/sys/dev/xen/xenstore/xenstore_dev.c b/sys/dev/xen/xenstore/xenstore_dev.c
index c88901bb5d68..a7818ee25b56 100644
--- a/sys/dev/xen/xenstore/xenstore_dev.c
+++ b/sys/dev/xen/xenstore/xenstore_dev.c
@@ -544,7 +544,5 @@ static device_method_t xs_dev_methods[] = {
};
DEFINE_CLASS_0(xs_dev, xs_dev_driver, xs_dev_methods, 0);
-devclass_t xs_dev_devclass;
-DRIVER_MODULE(xs_dev, xenstore, xs_dev_driver, xs_dev_devclass,
- NULL, NULL);
+DRIVER_MODULE(xs_dev, xenstore, xs_dev_driver, NULL, NULL);
diff --git a/sys/dev/xen/xenstore/xenstored_dev.c b/sys/dev/xen/xenstore/xenstored_dev.c
index 48d121b68ba3..340536fbc56c 100644
--- a/sys/dev/xen/xenstore/xenstored_dev.c
+++ b/sys/dev/xen/xenstore/xenstored_dev.c
@@ -158,7 +158,5 @@ static device_method_t xsd_dev_methods[] = {
};
DEFINE_CLASS_0(xsd_dev, xsd_dev_driver, xsd_dev_methods, 0);
-devclass_t xsd_dev_devclass;
-DRIVER_MODULE(xsd_dev, xenpv, xsd_dev_driver, xsd_dev_devclass,
- NULL, NULL);
+DRIVER_MODULE(xsd_dev, xenpv, xsd_dev_driver, NULL, NULL);
diff --git a/sys/xen/xenbus/xenbusb_back.c b/sys/xen/xenbus/xenbusb_back.c
index ae0c83237154..597618b64eb3 100644
--- a/sys/xen/xenbus/xenbusb_back.c
+++ b/sys/xen/xenbus/xenbusb_back.c
@@ -312,7 +312,5 @@ static device_method_t xenbusb_back_methods[] = {
DEFINE_CLASS_0(xenbusb_back, xenbusb_back_driver, xenbusb_back_methods,
sizeof(struct xenbusb_softc));
-devclass_t xenbusb_back_devclass;
-DRIVER_MODULE(xenbusb_back, xenstore, xenbusb_back_driver,
- xenbusb_back_devclass, 0, 0);
+DRIVER_MODULE(xenbusb_back, xenstore, xenbusb_back_driver, 0, 0);
diff --git a/sys/xen/xenbus/xenbusb_front.c b/sys/xen/xenbus/xenbusb_front.c
index 7cb5bc33d1e7..4dddc01e64e5 100644
--- a/sys/xen/xenbus/xenbusb_front.c
+++ b/sys/xen/xenbus/xenbusb_front.c
@@ -189,7 +189,5 @@ static device_method_t xenbusb_front_methods[] = {
DEFINE_CLASS_0(xenbusb_front, xenbusb_front_driver, xenbusb_front_methods,
sizeof(struct xenbusb_softc));
-devclass_t xenbusb_front_devclass;
-DRIVER_MODULE(xenbusb_front, xenstore, xenbusb_front_driver,
- xenbusb_front_devclass, 0, 0);
+DRIVER_MODULE(xenbusb_front, xenstore, xenbusb_front_driver, 0, 0);