arm/arm64 broadcom: Remove unused devclass arguments to DRIVER_MODULE.

This commit is contained in:
John Baldwin 2022-05-09 14:26:44 -07:00
parent b596f9b860
commit 82d4dc0621
27 changed files with 41 additions and 90 deletions

View File

@ -715,8 +715,6 @@ static device_method_t bcm_bsc_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_bsc_devclass;
static driver_t bcm_bsc_driver = {
"iichb",
bcm_bsc_methods,
@ -724,4 +722,4 @@ static driver_t bcm_bsc_driver = {
};
DRIVER_MODULE(iicbus, bcm2835_bsc, iicbus_driver, 0, 0);
DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, bcm_bsc_devclass, 0, 0);
DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, 0, 0);

View File

@ -201,13 +201,11 @@ static device_method_t bcm2835_clkman_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm2835_clkman_devclass;
static driver_t bcm2835_clkman_driver = {
"bcm2835_clkman",
bcm2835_clkman_methods,
sizeof(struct bcm2835_clkman_softc),
};
DRIVER_MODULE(bcm2835_clkman, simplebus, bcm2835_clkman_driver,
bcm2835_clkman_devclass, 0, 0);
DRIVER_MODULE(bcm2835_clkman, simplebus, bcm2835_clkman_driver, 0, 0);
MODULE_VERSION(bcm2835_clkman, 1);

View File

@ -1594,13 +1594,11 @@ static device_method_t bcm2835_cpufreq_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm2835_cpufreq_devclass;
static driver_t bcm2835_cpufreq_driver = {
"bcm2835_cpufreq",
bcm2835_cpufreq_methods,
sizeof(struct bcm2835_cpufreq_softc),
};
DRIVER_MODULE(bcm2835_cpufreq, cpu, bcm2835_cpufreq_driver,
bcm2835_cpufreq_devclass, 0, 0);
DRIVER_MODULE(bcm2835_cpufreq, cpu, bcm2835_cpufreq_driver, 0, 0);
MODULE_DEPEND(bcm2835_cpufreq, bcm2835_firmware, 1, 1, 1);

View File

@ -764,7 +764,5 @@ static driver_t bcm_dma_driver = {
sizeof(struct bcm_dma_softc),
};
static devclass_t bcm_dma_devclass;
DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, bcm_dma_devclass, 0, 0);
DRIVER_MODULE(bcm_dma, simplebus, bcm_dma_driver, 0, 0);
MODULE_VERSION(bcm_dma, 1);

View File

@ -194,16 +194,14 @@ static device_method_t bcm_fb_methods[] = {
{ 0, 0 }
};
static devclass_t bcm_fb_devclass;
static driver_t bcm_fb_driver = {
"fb",
bcm_fb_methods,
sizeof(struct bcmsc_softc),
};
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, 0, 0);
/*
* Video driver routines and glue.

View File

@ -275,13 +275,11 @@ static device_method_t bcm_fb_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_fb_devclass;
static driver_t bcm_fb_driver = {
"fb",
bcm_fb_methods,
sizeof(struct bcmsc_softc),
};
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
DRIVER_MODULE(bcm2835fb, ofwbus, bcm_fb_driver, 0, 0);
DRIVER_MODULE(bcm2835fb, simplebus, bcm_fb_driver, 0, 0);

View File

@ -174,11 +174,10 @@ static device_method_t bcm2835_firmware_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm2835_firmware_devclass;
DEFINE_CLASS_1(bcm2835_firmware, bcm2835_firmware_driver,
bcm2835_firmware_methods, sizeof(struct bcm2835_firmware_softc),
simplebus_driver);
EARLY_DRIVER_MODULE(bcm2835_firmware, simplebus, bcm2835_firmware_driver,
bcm2835_firmware_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
EARLY_DRIVER_MODULE(bcm2835_firmware, simplebus, bcm2835_firmware_driver, 0, 0,
BUS_PASS_BUS + BUS_PASS_ORDER_LATE);
MODULE_DEPEND(bcm2835_firmware, mbox, 1, 1, 1);

View File

@ -325,12 +325,11 @@ static device_method_t ft5406ts_methods[] = {
DEVMETHOD_END
};
static devclass_t ft5406ts_devclass;
static driver_t ft5406ts_driver = {
"ft5406ts",
ft5406ts_methods,
sizeof(struct ft5406ts_softc),
};
DRIVER_MODULE(ft5406ts, simplebus, ft5406ts_driver, ft5406ts_devclass, 0, 0);
DRIVER_MODULE(ft5406ts, simplebus, ft5406ts_driver, 0, 0);
MODULE_DEPEND(ft5406ts, evdev, 1, 1, 1);

View File

@ -1311,12 +1311,11 @@ static device_method_t bcm_gpio_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_gpio_devclass;
static driver_t bcm_gpio_driver = {
"gpio",
bcm_gpio_methods,
sizeof(struct bcm_gpio_softc),
};
EARLY_DRIVER_MODULE(bcm_gpio, simplebus, bcm_gpio_driver, bcm_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
EARLY_DRIVER_MODULE(bcm_gpio, simplebus, bcm_gpio_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);

View File

@ -447,7 +447,5 @@ static driver_t bcm_intc_driver = {
sizeof(struct bcm_intc_softc),
};
static devclass_t bcm_intc_devclass;
EARLY_DRIVER_MODULE(intc, simplebus, bcm_intc_driver, bcm_intc_devclass,
0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
EARLY_DRIVER_MODULE(intc, simplebus, bcm_intc_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);

View File

@ -292,9 +292,7 @@ static driver_t bcm_mbox_driver = {
sizeof(struct bcm_mbox_softc),
};
static devclass_t bcm_mbox_devclass;
EARLY_DRIVER_MODULE(mbox, simplebus, bcm_mbox_driver, bcm_mbox_devclass, 0, 0,
EARLY_DRIVER_MODULE(mbox, simplebus, bcm_mbox_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST);
static void

View File

@ -500,13 +500,11 @@ static device_method_t bcm_pwm_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_pwm_devclass;
static driver_t bcm_pwm_driver = {
"pwm",
bcm_pwm_methods,
sizeof(struct bcm_pwm_softc),
};
DRIVER_MODULE(bcm2835_pwm, simplebus, bcm_pwm_driver, bcm_pwm_devclass, 0, 0);
DRIVER_MODULE(bcm2835_pwm, simplebus, bcm_pwm_driver, 0, 0);
MODULE_DEPEND(bcm2835_pwm, bcm2835_clkman, 1, 1, 1);

View File

@ -549,11 +549,8 @@ static driver_t bcm2835_rng_driver = {
bcm2835_rng_methods,
sizeof(struct bcm2835_rng_softc)
};
static devclass_t bcm2835_rng_devclass;
DRIVER_MODULE(bcm2835_rng, simplebus, bcm2835_rng_driver,
bcm2835_rng_devclass, 0, 0);
DRIVER_MODULE(bcm2835_rng, ofwbus, bcm2835_rng_driver, bcm2835_rng_devclass, 0,
0);
DRIVER_MODULE(bcm2835_rng, simplebus, bcm2835_rng_driver, 0, 0);
DRIVER_MODULE(bcm2835_rng, ofwbus, bcm2835_rng_driver, 0, 0);
MODULE_VERSION(bcm2835_rng, 1);
MODULE_DEPEND(bcm2835_rng, randomdev, 1, 1, 1);

View File

@ -852,16 +852,13 @@ static device_method_t bcm_sdhci_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_sdhci_devclass;
static driver_t bcm_sdhci_driver = {
"sdhci_bcm",
bcm_sdhci_methods,
sizeof(struct bcm_sdhci_softc),
};
DRIVER_MODULE(sdhci_bcm, simplebus, bcm_sdhci_driver, bcm_sdhci_devclass,
NULL, NULL);
DRIVER_MODULE(sdhci_bcm, simplebus, bcm_sdhci_driver, NULL, NULL);
#ifdef NOTYET
MODULE_DEPEND(sdhci_bcm, bcm2835_clkman, 1, 1, 1);
#endif

View File

@ -1274,16 +1274,13 @@ static device_method_t bcm_sdhost_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_sdhost_devclass;
static driver_t bcm_sdhost_driver = {
"sdhost_bcm",
bcm_sdhost_methods,
sizeof(struct bcm_sdhost_softc),
};
DRIVER_MODULE(sdhost_bcm, simplebus, bcm_sdhost_driver, bcm_sdhost_devclass,
NULL, NULL);
DRIVER_MODULE(sdhost_bcm, simplebus, bcm_sdhost_driver, NULL, NULL);
SDHCI_DEPEND(sdhost_bcm);
#ifndef MMCCAM
MMC_DECLARE_BRIDGE(sdhost_bcm);

View File

@ -561,12 +561,10 @@ static device_method_t bcm_spi_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm_spi_devclass;
static driver_t bcm_spi_driver = {
"spi",
bcm_spi_methods,
sizeof(struct bcm_spi_softc),
};
DRIVER_MODULE(bcm2835_spi, simplebus, bcm_spi_driver, bcm_spi_devclass, 0, 0);
DRIVER_MODULE(bcm2835_spi, simplebus, bcm_spi_driver, 0, 0);

View File

@ -285,9 +285,7 @@ static driver_t bcm_systimer_driver = {
sizeof(struct bcm_systimer_softc),
};
static devclass_t bcm_systimer_devclass;
DRIVER_MODULE(bcm_systimer, simplebus, bcm_systimer_driver, bcm_systimer_devclass, 0, 0);
DRIVER_MODULE(bcm_systimer, simplebus, bcm_systimer_driver, 0, 0);
static void
bcm_systimer_delay(int usec, void *arg)

View File

@ -256,6 +256,5 @@ static driver_t bcmwd_driver = {
bcmwd_methods,
sizeof(struct bcmwd_softc),
};
static devclass_t bcmwd_devclass;
DRIVER_MODULE(bcmwd, simplebus, bcmwd_driver, bcmwd_devclass, 0, 0);
DRIVER_MODULE(bcmwd, simplebus, bcmwd_driver, 0, 0);

View File

@ -739,7 +739,5 @@ static driver_t bcm_lintc_driver = {
sizeof(struct bcm_lintc_softc),
};
static devclass_t bcm_lintc_devclass;
EARLY_DRIVER_MODULE(lintc, simplebus, bcm_lintc_driver, bcm_lintc_devclass,
0, 0, BUS_PASS_INTERRUPT);
EARLY_DRIVER_MODULE(lintc, simplebus, bcm_lintc_driver, 0, 0,
BUS_PASS_INTERRUPT);

View File

@ -777,6 +777,5 @@ static device_method_t bcm_pcib_methods[] = {
DEFINE_CLASS_1(pcib, bcm_pcib_driver, bcm_pcib_methods,
sizeof(struct bcm_pcib_softc), generic_pcie_fdt_driver);
static devclass_t bcm_pcib_devclass;
DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0);
DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, 0, 0);

View File

@ -214,5 +214,5 @@ static device_method_t bcm_xhci_methods[] = {
DEFINE_CLASS_1(bcm_xhci, bcm_xhci_driver, bcm_xhci_methods,
sizeof(struct xhci_softc), xhci_pci_driver);
static devclass_t xhci_devclass;
DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, xhci_devclass, 0, 0); MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1);
DRIVER_MODULE(bcm_xhci, pci, bcm_xhci_driver, 0, 0);
MODULE_DEPEND(bcm_xhci, usb, 1, 1, 1);

View File

@ -96,10 +96,7 @@ static device_method_t bcm283x_dwc_otg_methods[] = {
DEVMETHOD_END
};
static devclass_t bcm283x_dwc_otg_devclass;
DEFINE_CLASS_1(bcm283x_dwcotg, bcm283x_dwc_otg_driver, bcm283x_dwc_otg_methods,
sizeof(struct dwc_otg_fdt_softc), dwc_otg_driver);
DRIVER_MODULE(bcm283x_dwcotg, simplebus, bcm283x_dwc_otg_driver,
bcm283x_dwc_otg_devclass, 0, 0);
DRIVER_MODULE(bcm283x_dwcotg, simplebus, bcm283x_dwc_otg_driver, 0, 0);
MODULE_DEPEND(bcm283x_dwcotg, usb, 1, 1, 1);

View File

@ -445,13 +445,11 @@ static device_method_t rpi_fw_gpio_methods[] = {
DEVMETHOD_END
};
static devclass_t rpi_fw_gpio_devclass;
static driver_t rpi_fw_gpio_driver = {
"gpio",
rpi_fw_gpio_methods,
sizeof(struct rpi_fw_gpio_softc),
};
EARLY_DRIVER_MODULE(rpi_fw_gpio, bcm2835_firmware, rpi_fw_gpio_driver,
rpi_fw_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);
EARLY_DRIVER_MODULE(rpi_fw_gpio, bcm2835_firmware, rpi_fw_gpio_driver, 0, 0,
BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE);

View File

@ -138,12 +138,10 @@ static device_method_t brcm_iproc_mdio_fdt_methods[] = {
DEFINE_CLASS_0(brcm_iproc_mdio, brcm_iproc_mdio_driver,
brcm_iproc_mdio_fdt_methods, sizeof(struct brcm_iproc_mdio_softc));
static devclass_t brcm_iproc_mdio_fdt_devclass;
EARLY_DRIVER_MODULE(brcm_iproc_mdio, ofwbus, brcm_iproc_mdio_driver,
brcm_iproc_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
EARLY_DRIVER_MODULE(brcm_iproc_mdio, simplebus, brcm_iproc_mdio_driver,
brcm_iproc_mdio_fdt_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
EARLY_DRIVER_MODULE(brcm_iproc_mdio, ofwbus, brcm_iproc_mdio_driver, 0, 0,
BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
EARLY_DRIVER_MODULE(brcm_iproc_mdio, simplebus, brcm_iproc_mdio_driver, 0, 0,
BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static struct ofw_compat_data mdio_compat_data[] = {
{"brcm,mdio-mux-iproc", true},

View File

@ -95,15 +95,14 @@ static device_method_t brcm_mdionexus_fdt_methods[] = {
DEFINE_CLASS_0(brcm_mdionexus, brcm_mdionexus_fdt_driver, brcm_mdionexus_fdt_methods,
sizeof(struct brcm_mdionexus_softc));
static devclass_t brcm_mdionexus_fdt_devclass;
static driver_t brcm_mdionexus_driver = {
"brcm_mdionexus",
brcm_mdionexus_fdt_methods,
sizeof(struct brcm_mdionexus_softc)
};
EARLY_DRIVER_MODULE(brcm_mdionexus, brcm_iproc_mdio, brcm_mdionexus_driver,
brcm_mdionexus_fdt_devclass, NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static int brcm_mdionexus_ofw_bus_attach(device_t);

View File

@ -69,15 +69,14 @@ static device_method_t ns2_pcie_phy_fdt_methods[] = {
DEFINE_CLASS_0(ns2_pcie_phy, ns2_pcie_phy_fdt_driver, ns2_pcie_phy_fdt_methods,
sizeof(struct ns2_pcie_phy_softc));
static devclass_t ns2_pcie_phy_fdt_devclass;
static driver_t ns2_pcie_phy_driver = {
"ns2_pcie_phy",
ns2_pcie_phy_fdt_methods,
sizeof(struct ns2_pcie_phy_softc)
};
EARLY_DRIVER_MODULE(ns2_pcie_phy, brcm_mdionexus, ns2_pcie_phy_driver,
ns2_pcie_phy_fdt_devclass, NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
static int
ns2_pci_phy_init(device_t dev)

View File

@ -1821,9 +1821,7 @@ static driver_t gen_driver = {
sizeof(struct gen_softc),
};
static devclass_t gen_devclass;
DRIVER_MODULE(genet, simplebus, gen_driver, gen_devclass, 0, 0);
DRIVER_MODULE(genet, simplebus, gen_driver, 0, 0);
DRIVER_MODULE(miibus, genet, miibus_driver, 0, 0);
MODULE_DEPEND(genet, ether, 1, 1, 1);
MODULE_DEPEND(genet, miibus, 1, 1, 1);