Date: Mon, 9 May 2022 19:23:30 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: 0d95fe04c65c - main - spi flash: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205091923.249JNUrE086274@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=0d95fe04c65c371dab9ed7039440b40720e79559 commit 0d95fe04c65c371dab9ed7039440b40720e79559 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-05-09 19:22:04 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-09 19:22:04 +0000 spi flash: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/flash/at45d.c | 4 +--- sys/dev/flash/cqspi.c | 4 +--- sys/dev/flash/flexspi/flex_spi.c | 3 +-- sys/dev/flash/mx25l.c | 4 +--- sys/dev/flash/n25q.c | 4 +--- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/dev/flash/at45d.c b/sys/dev/flash/at45d.c index 2c7402dbbe82..f9495b9a56e8 100644 --- a/sys/dev/flash/at45d.c +++ b/sys/dev/flash/at45d.c @@ -584,8 +584,6 @@ at45d_task(void *arg) } } -static devclass_t at45d_devclass; - static device_method_t at45d_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at45d_probe), @@ -601,7 +599,7 @@ static driver_t at45d_driver = { sizeof(struct at45d_softc), }; -DRIVER_MODULE(at45d, spibus, at45d_driver, at45d_devclass, NULL, NULL); +DRIVER_MODULE(at45d, spibus, at45d_driver, NULL, NULL); MODULE_DEPEND(at45d, spibus, 1, 1, 1); #ifdef FDT MODULE_DEPEND(at45d, fdt_slicer, 1, 1, 1); diff --git a/sys/dev/flash/cqspi.c b/sys/dev/flash/cqspi.c index b1b1f4cbc7ad..819877944241 100644 --- a/sys/dev/flash/cqspi.c +++ b/sys/dev/flash/cqspi.c @@ -759,9 +759,7 @@ static device_method_t cqspi_methods[] = { { 0, 0 } }; -static devclass_t cqspi_devclass; - DEFINE_CLASS_1(cqspi, cqspi_driver, cqspi_methods, sizeof(struct cqspi_softc), simplebus_driver); -DRIVER_MODULE(cqspi, simplebus, cqspi_driver, cqspi_devclass, 0, 0); +DRIVER_MODULE(cqspi, simplebus, cqspi_driver, 0, 0); diff --git a/sys/dev/flash/flexspi/flex_spi.c b/sys/dev/flash/flexspi/flex_spi.c index 0637d7f846c6..271431bb92e0 100644 --- a/sys/dev/flash/flexspi/flex_spi.c +++ b/sys/dev/flash/flexspi/flex_spi.c @@ -972,7 +972,6 @@ flex_spi_task(void *arg) } } -static devclass_t flex_spi_devclass; static device_method_t flex_spi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, flex_spi_probe), @@ -988,5 +987,5 @@ static driver_t flex_spi_driver = { sizeof(struct flex_spi_softc), }; -DRIVER_MODULE(flex_spi, simplebus, flex_spi_driver, flex_spi_devclass, 0, 0); +DRIVER_MODULE(flex_spi, simplebus, flex_spi_driver, 0, 0); SIMPLEBUS_PNP_INFO(flex_spi_compat_data); diff --git a/sys/dev/flash/mx25l.c b/sys/dev/flash/mx25l.c index dfe670f73aee..b57e9c9f8f77 100644 --- a/sys/dev/flash/mx25l.c +++ b/sys/dev/flash/mx25l.c @@ -668,8 +668,6 @@ mx25l_task(void *arg) } } -static devclass_t mx25l_devclass; - static device_method_t mx25l_methods[] = { /* Device interface */ DEVMETHOD(device_probe, mx25l_probe), @@ -685,7 +683,7 @@ static driver_t mx25l_driver = { sizeof(struct mx25l_softc), }; -DRIVER_MODULE(mx25l, spibus, mx25l_driver, mx25l_devclass, 0, 0); +DRIVER_MODULE(mx25l, spibus, mx25l_driver, 0, 0); MODULE_DEPEND(mx25l, spibus, 1, 1, 1); #ifdef FDT MODULE_DEPEND(mx25l, fdt_slicer, 1, 1, 1); diff --git a/sys/dev/flash/n25q.c b/sys/dev/flash/n25q.c index b64d3fa57474..6a577e107cb5 100644 --- a/sys/dev/flash/n25q.c +++ b/sys/dev/flash/n25q.c @@ -465,8 +465,6 @@ n25q_task(void *arg) } } -static devclass_t n25q_devclass; - static device_method_t n25q_methods[] = { /* Device interface */ DEVMETHOD(device_probe, n25q_probe), @@ -482,4 +480,4 @@ static driver_t n25q_driver = { sizeof(struct n25q_softc), }; -DRIVER_MODULE(n25q, simplebus, n25q_driver, n25q_devclass, 0, 0); +DRIVER_MODULE(n25q, simplebus, n25q_driver, 0, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205091923.249JNUrE086274>