Date: Fri, 6 May 2022 23:25:00 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c90ea831121b - main - Remove unused uart_devclass. Message-ID: <202205062325.246NP0Fq075316@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c90ea831121be188c1ad43de96c4835f7e6a63d9 commit c90ea831121be188c1ad43de96c4835f7e6a63d9 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-06 22:46:57 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:46:57 +0000 Remove unused uart_devclass. --- sys/arm/nvidia/tegra_uart.c | 3 +-- sys/dev/uart/uart_bus.h | 1 - sys/dev/uart/uart_bus_acpi.c | 2 +- sys/dev/uart/uart_bus_fdt.c | 4 ++-- sys/dev/uart/uart_bus_isa.c | 2 +- sys/dev/uart/uart_bus_pci.c | 2 +- sys/dev/uart/uart_bus_puc.c | 2 +- sys/dev/uart/uart_bus_scc.c | 2 +- sys/dev/uart/uart_core.c | 1 - sys/dev/uart/uart_dev_snps.c | 2 +- sys/powerpc/powernv/opal_console.c | 2 +- sys/powerpc/pseries/phyp_console.c | 2 +- sys/powerpc/psim/uart_iobus.c | 2 +- 13 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/arm/nvidia/tegra_uart.c b/sys/arm/nvidia/tegra_uart.c index 9ba567c6d55f..2c427689952a 100644 --- a/sys/arm/nvidia/tegra_uart.c +++ b/sys/arm/nvidia/tegra_uart.c @@ -248,5 +248,4 @@ static driver_t tegra_uart_driver = { sizeof(struct tegra_softc), }; -DRIVER_MODULE(tegra_uart, simplebus, tegra_uart_driver, uart_devclass, - 0, 0); +DRIVER_MODULE(tegra_uart, simplebus, tegra_uart_driver, 0, 0); diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h index 5da3cecccf85..1a7e1e0dbb27 100644 --- a/sys/dev/uart/uart_bus.h +++ b/sys/dev/uart/uart_bus.h @@ -137,7 +137,6 @@ struct uart_softc { } sc_u; }; -extern devclass_t uart_devclass; extern const char uart_driver_name[]; int uart_bus_attach(device_t dev); diff --git a/sys/dev/uart/uart_bus_acpi.c b/sys/dev/uart/uart_bus_acpi.c index 4e4c3541aad2..1018412392dd 100644 --- a/sys/dev/uart/uart_bus_acpi.c +++ b/sys/dev/uart/uart_bus_acpi.c @@ -98,4 +98,4 @@ uart_acpi_probe(device_t dev) return (ENXIO); } -DRIVER_MODULE(uart, acpi, uart_acpi_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, acpi, uart_acpi_driver, 0, 0); diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c index 985d58c850f0..4a22b4317d3e 100644 --- a/sys/dev/uart/uart_bus_fdt.c +++ b/sys/dev/uart/uart_bus_fdt.c @@ -293,5 +293,5 @@ uart_fdt_probe(device_t dev) return (uart_bus_probe(dev, (int)shift, (int)iowidth, (int)clock, 0, 0, 0)); } -DRIVER_MODULE(uart, simplebus, uart_fdt_driver, uart_devclass, 0, 0); -DRIVER_MODULE(uart, ofwbus, uart_fdt_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, simplebus, uart_fdt_driver, 0, 0); +DRIVER_MODULE(uart, ofwbus, uart_fdt_driver, 0, 0); diff --git a/sys/dev/uart/uart_bus_isa.c b/sys/dev/uart/uart_bus_isa.c index cebf90adf13f..9778f85be360 100644 --- a/sys/dev/uart/uart_bus_isa.c +++ b/sys/dev/uart/uart_bus_isa.c @@ -170,5 +170,5 @@ uart_isa_probe(device_t dev) return (uart_bus_probe(dev, 0, 0, 0, 0, 0, 0)); } -DRIVER_MODULE(uart, isa, uart_isa_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, isa, uart_isa_driver, 0, 0); ISA_PNP_INFO(isa_ns8250_ids); diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index a20be1c577d4..8fa7620d1cd2 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -347,4 +347,4 @@ uart_pci_detach(device_t dev) return (uart_bus_detach(dev)); } -DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL); +DRIVER_MODULE(uart, pci, uart_pci_driver, NULL, NULL); diff --git a/sys/dev/uart/uart_bus_puc.c b/sys/dev/uart/uart_bus_puc.c index a1dcdea11dd0..0b9164acb599 100644 --- a/sys/dev/uart/uart_bus_puc.c +++ b/sys/dev/uart/uart_bus_puc.c @@ -86,4 +86,4 @@ uart_puc_probe(device_t dev) return (uart_bus_probe(dev, 0, 0, rclk, 0, 0, 0)); } -DRIVER_MODULE(uart, puc, uart_puc_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, puc, uart_puc_driver, 0, 0); diff --git a/sys/dev/uart/uart_bus_scc.c b/sys/dev/uart/uart_bus_scc.c index 3b643524825e..b1423061be37 100644 --- a/sys/dev/uart/uart_bus_scc.c +++ b/sys/dev/uart/uart_bus_scc.c @@ -114,4 +114,4 @@ uart_scc_probe(device_t dev) return (uart_bus_probe(dev, rs, 0, cl, 0, ch, 0)); } -DRIVER_MODULE(uart, scc, uart_scc_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, scc, uart_scc_driver, 0, 0); diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c index 9cd620308cd5..e63fccd15d13 100644 --- a/sys/dev/uart/uart_core.c +++ b/sys/dev/uart/uart_core.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include "uart_if.h" -devclass_t uart_devclass; const char uart_driver_name[] = "uart"; SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs = diff --git a/sys/dev/uart/uart_dev_snps.c b/sys/dev/uart/uart_dev_snps.c index 0a1611cd9cef..b29fc48e5422 100644 --- a/sys/dev/uart/uart_dev_snps.c +++ b/sys/dev/uart/uart_dev_snps.c @@ -287,4 +287,4 @@ static driver_t snps_uart_driver = { sizeof(struct snps_softc) }; -DRIVER_MODULE(uart_snps, simplebus, snps_uart_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart_snps, simplebus, snps_uart_driver, 0, 0); diff --git a/sys/powerpc/powernv/opal_console.c b/sys/powerpc/powernv/opal_console.c index 8f6c88f81f7c..6b7e16891ec7 100644 --- a/sys/powerpc/powernv/opal_console.c +++ b/sys/powerpc/powernv/opal_console.c @@ -112,7 +112,7 @@ static driver_t uart_opal_driver = { sizeof(struct uart_opal_softc), }; -DRIVER_MODULE(uart_opal, opalcons, uart_opal_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart_opal, opalcons, uart_opal_driver, 0, 0); static int uart_opal_getc(struct uart_opal_softc *sc); static cn_probe_t uart_opal_cnprobe; diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c index 484952177d51..0b62447e399f 100644 --- a/sys/powerpc/pseries/phyp_console.c +++ b/sys/powerpc/pseries/phyp_console.c @@ -110,7 +110,7 @@ static driver_t uart_phyp_driver = { sizeof(struct uart_phyp_softc), }; -DRIVER_MODULE(uart_phyp, vdevice, uart_phyp_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart_phyp, vdevice, uart_phyp_driver, 0, 0); static cn_probe_t uart_phyp_cnprobe; static cn_init_t uart_phyp_cninit; diff --git a/sys/powerpc/psim/uart_iobus.c b/sys/powerpc/psim/uart_iobus.c index 9aa0a345d324..5f1f220f7ddd 100644 --- a/sys/powerpc/psim/uart_iobus.c +++ b/sys/powerpc/psim/uart_iobus.c @@ -84,4 +84,4 @@ uart_iobus_probe(device_t dev) return (uart_bus_probe(dev, 0, 0, 0, 0, 0, 0)); } -DRIVER_MODULE(uart, iobus, uart_iobus_driver, uart_devclass, 0, 0); +DRIVER_MODULE(uart, iobus, uart_iobus_driver, 0, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205062325.246NP0Fq075316>