The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9b9a5327820d336b36126db7b3252100ef57ee50
commit 9b9a5327820d336b36126db7b3252100ef57ee50 Author: John Baldwin <[email protected]> AuthorDate: 2022-05-10 17:21:38 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-05-10 17:21:38 +0000 powerpc pseries: Remove unused devclass arguments to DRIVER_MODULE. --- sys/powerpc/pseries/phyp_llan.c | 5 +++-- sys/powerpc/pseries/phyp_vscsi.c | 5 +++-- sys/powerpc/pseries/plpar_pcibus.c | 3 +-- sys/powerpc/pseries/rtas_dev.c | 4 +--- sys/powerpc/pseries/rtas_pci.c | 3 +-- sys/powerpc/pseries/vdevice.c | 4 +--- sys/powerpc/pseries/xics.c | 9 ++------- 7 files changed, 12 insertions(+), 21 deletions(-) diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c index 1edc342ceb44..accb8406f043 100644 --- a/sys/powerpc/pseries/phyp_llan.c +++ b/sys/powerpc/pseries/phyp_llan.c @@ -127,19 +127,20 @@ static void llan_rx_load_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, static int llan_add_rxbuf(struct llan_softc *sc, struct llan_xfer *rx); static int llan_set_multicast(struct llan_softc *sc); -static devclass_t llan_devclass; static device_method_t llan_methods[] = { DEVMETHOD(device_probe, llan_probe), DEVMETHOD(device_attach, llan_attach), DEVMETHOD_END }; + static driver_t llan_driver = { "llan", llan_methods, sizeof(struct llan_softc) }; -DRIVER_MODULE(llan, vdevice, llan_driver, llan_devclass, 0, 0); + +DRIVER_MODULE(llan, vdevice, llan_driver, 0, 0); static int llan_probe(device_t dev) diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c index 5e72daa56dae..a5828be2aff1 100644 --- a/sys/powerpc/pseries/phyp_vscsi.c +++ b/sys/powerpc/pseries/phyp_vscsi.c @@ -250,7 +250,6 @@ static void vscsi_scsi_command(void *xxp, bus_dma_segment_t *segs, static void vscsi_task_management(struct vscsi_softc *sc, union ccb *ccb); static void vscsi_srp_response(struct vscsi_xfer *, struct vscsi_crq *); -static devclass_t vscsi_devclass; static device_method_t vscsi_methods[] = { DEVMETHOD(device_probe, vscsi_probe), DEVMETHOD(device_attach, vscsi_attach), @@ -258,12 +257,14 @@ static device_method_t vscsi_methods[] = { DEVMETHOD_END }; + static driver_t vscsi_driver = { "vscsi", vscsi_methods, sizeof(struct vscsi_softc) }; -DRIVER_MODULE(vscsi, vdevice, vscsi_driver, vscsi_devclass, 0, 0); + +DRIVER_MODULE(vscsi, vdevice, vscsi_driver, 0, 0); MALLOC_DEFINE(M_VSCSI, "vscsi", "CAM device queue for VSCSI"); static int diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c index 23abb4acd53b..1c0786402ef7 100644 --- a/sys/powerpc/pseries/plpar_pcibus.c +++ b/sys/powerpc/pseries/plpar_pcibus.c @@ -69,10 +69,9 @@ static device_method_t plpar_pcibus_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; DEFINE_CLASS_1(pci, plpar_pcibus_driver, plpar_pcibus_methods, sizeof(struct pci_softc), ofw_pcibus_driver); -DRIVER_MODULE(plpar_pcibus, pcib, plpar_pcibus_driver, pci_devclass, 0, 0); +DRIVER_MODULE(plpar_pcibus, pcib, plpar_pcibus_driver, 0, 0); static int plpar_pcibus_probe(device_t dev) diff --git a/sys/powerpc/pseries/rtas_dev.c b/sys/powerpc/pseries/rtas_dev.c index 55d2b2d3a92f..4f3af890688a 100644 --- a/sys/powerpc/pseries/rtas_dev.c +++ b/sys/powerpc/pseries/rtas_dev.c @@ -74,9 +74,7 @@ static driver_t rtasdev_driver = { 0 }; -static devclass_t rtasdev_devclass; - -DRIVER_MODULE(rtasdev, ofwbus, rtasdev_driver, rtasdev_devclass, 0, 0); +DRIVER_MODULE(rtasdev, ofwbus, rtasdev_driver, 0, 0); static int rtasdev_probe(device_t dev) diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c index 3c03724cf3d6..876eb24a592a 100644 --- a/sys/powerpc/pseries/rtas_pci.c +++ b/sys/powerpc/pseries/rtas_pci.c @@ -99,10 +99,9 @@ struct rtaspci_softc { int sc_extended_config; }; -static devclass_t rtaspci_devclass; DEFINE_CLASS_1(pcib, rtaspci_driver, rtaspci_methods, sizeof(struct rtaspci_softc), ofw_pcib_driver); -DRIVER_MODULE(rtaspci, ofwbus, rtaspci_driver, rtaspci_devclass, 0, 0); +DRIVER_MODULE(rtaspci, ofwbus, rtaspci_driver, 0, 0); static int rtaspci_probe(device_t dev) diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c index fa0fafb2d67d..dcc79b5ad903 100644 --- a/sys/powerpc/pseries/vdevice.c +++ b/sys/powerpc/pseries/vdevice.c @@ -103,9 +103,7 @@ static driver_t vdevice_driver = { 0 }; -static devclass_t vdevice_devclass; - -DRIVER_MODULE(vdevice, ofwbus, vdevice_driver, vdevice_devclass, 0, 0); +DRIVER_MODULE(vdevice, ofwbus, vdevice_driver, 0, 0); static int vdevice_probe(device_t dev) diff --git a/sys/powerpc/pseries/xics.c b/sys/powerpc/pseries/xics.c index b3ddf3f0bf15..7fd68baf2205 100644 --- a/sys/powerpc/pseries/xics.c +++ b/sys/powerpc/pseries/xics.c @@ -155,13 +155,8 @@ static driver_t xics_driver = { static uint32_t cpu_xirr[MAXCPU]; #endif -static devclass_t xicp_devclass; -static devclass_t xics_devclass; - -EARLY_DRIVER_MODULE(xicp, ofwbus, xicp_driver, xicp_devclass, 0, 0, - BUS_PASS_INTERRUPT-1); -EARLY_DRIVER_MODULE(xics, ofwbus, xics_driver, xics_devclass, 0, 0, - BUS_PASS_INTERRUPT); +EARLY_DRIVER_MODULE(xicp, ofwbus, xicp_driver, 0, 0, BUS_PASS_INTERRUPT - 1); +EARLY_DRIVER_MODULE(xics, ofwbus, xics_driver, 0, 0, BUS_PASS_INTERRUPT); #ifdef POWERNV static struct resource *
