Date: Fri, 6 May 2022 22:43:44 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: b58c5abf075f - main - mmc: Remove unused devclass arguments to DRIVER_MODULE. Message-ID: <202205062243.246Mhikw020084@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=b58c5abf075fcbfc515a353113470374ffc95b6f commit b58c5abf075fcbfc515a353113470374ffc95b6f Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2022-04-20 17:01:11 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2022-05-06 22:39:32 +0000 mmc: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/mmc/bridge.h | 3 +-- sys/dev/mmc/host/dwmmc_altera.c | 8 ++------ sys/dev/mmc/host/dwmmc_hisi.c | 8 ++------ sys/dev/mmc/host/dwmmc_rockchip.c | 8 ++------ sys/dev/mmc/host/dwmmc_samsung.c | 8 ++------ sys/dev/mmc/mmc.c | 1 - sys/dev/mmc/mmc_pwrseq.c | 4 +--- sys/dev/mmc/mmcsd.c | 3 +-- sys/dev/mmcnull/mmcnull.c | 4 +--- 9 files changed, 12 insertions(+), 35 deletions(-) diff --git a/sys/dev/mmc/bridge.h b/sys/dev/mmc/bridge.h index 5fbe11663708..307c504df517 100644 --- a/sys/dev/mmc/bridge.h +++ b/sys/dev/mmc/bridge.h @@ -180,12 +180,11 @@ struct mmc_host { #ifdef _KERNEL extern driver_t mmc_driver; -extern devclass_t mmc_devclass; #define MMC_VERSION 5 #define MMC_DECLARE_BRIDGE(name) \ - DRIVER_MODULE(mmc, name, mmc_driver, mmc_devclass, NULL, NULL); \ + DRIVER_MODULE(mmc, name, mmc_driver, NULL, NULL); \ MODULE_DEPEND(name, mmc, MMC_VERSION, MMC_VERSION, MMC_VERSION); #define MMC_DEPEND(name) \ MODULE_DEPEND(name, mmc, MMC_VERSION, MMC_VERSION, MMC_VERSION); diff --git a/sys/dev/mmc/host/dwmmc_altera.c b/sys/dev/mmc/host/dwmmc_altera.c index 54c227254ff4..636fa608399e 100644 --- a/sys/dev/mmc/host/dwmmc_altera.c +++ b/sys/dev/mmc/host/dwmmc_altera.c @@ -93,15 +93,11 @@ static device_method_t altera_dwmmc_methods[] = { DEVMETHOD_END }; -static devclass_t altera_dwmmc_devclass; - DEFINE_CLASS_1(altera_dwmmc, altera_dwmmc_driver, altera_dwmmc_methods, sizeof(struct dwmmc_softc), dwmmc_driver); -DRIVER_MODULE(altera_dwmmc, simplebus, altera_dwmmc_driver, - altera_dwmmc_devclass, 0, 0); -DRIVER_MODULE(altera_dwmmc, ofwbus, altera_dwmmc_driver, altera_dwmmc_devclass - , NULL, NULL); +DRIVER_MODULE(altera_dwmmc, simplebus, altera_dwmmc_driver, 0, 0); +DRIVER_MODULE(altera_dwmmc, ofwbus, altera_dwmmc_driver, NULL, NULL); #ifndef MMCCAM MMC_DECLARE_BRIDGE(altera_dwmmc); #endif diff --git a/sys/dev/mmc/host/dwmmc_hisi.c b/sys/dev/mmc/host/dwmmc_hisi.c index 5d6a95cfdd37..a4f3c177a83e 100644 --- a/sys/dev/mmc/host/dwmmc_hisi.c +++ b/sys/dev/mmc/host/dwmmc_hisi.c @@ -92,15 +92,11 @@ static device_method_t hisi_dwmmc_methods[] = { DEVMETHOD_END }; -static devclass_t hisi_dwmmc_devclass; - DEFINE_CLASS_1(hisi_dwmmc, hisi_dwmmc_driver, hisi_dwmmc_methods, sizeof(struct dwmmc_softc), dwmmc_driver); -DRIVER_MODULE(hisi_dwmmc, simplebus, hisi_dwmmc_driver, - hisi_dwmmc_devclass, 0, 0); -DRIVER_MODULE(hisi_dwmmc, ofwbus, hisi_dwmmc_driver, hisi_dwmmc_devclass - , NULL, NULL); +DRIVER_MODULE(hisi_dwmmc, simplebus, hisi_dwmmc_driver, 0, 0); +DRIVER_MODULE(hisi_dwmmc, ofwbus, hisi_dwmmc_driver, NULL, NULL); #ifndef MMCCAM MMC_DECLARE_BRIDGE(hisi_dwmmc); #endif diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c index 44fbf720f908..ff02335068bd 100644 --- a/sys/dev/mmc/host/dwmmc_rockchip.c +++ b/sys/dev/mmc/host/dwmmc_rockchip.c @@ -133,15 +133,11 @@ static device_method_t rockchip_dwmmc_methods[] = { DEVMETHOD_END }; -static devclass_t rockchip_dwmmc_devclass; - DEFINE_CLASS_1(rockchip_dwmmc, rockchip_dwmmc_driver, rockchip_dwmmc_methods, sizeof(struct dwmmc_softc), dwmmc_driver); -DRIVER_MODULE(rockchip_dwmmc, simplebus, rockchip_dwmmc_driver, - rockchip_dwmmc_devclass, 0, 0); -DRIVER_MODULE(rockchip_dwmmc, ofwbus, rockchip_dwmmc_driver, - rockchip_dwmmc_devclass, NULL, NULL); +DRIVER_MODULE(rockchip_dwmmc, simplebus, rockchip_dwmmc_driver, 0, 0); +DRIVER_MODULE(rockchip_dwmmc, ofwbus, rockchip_dwmmc_driver, NULL, NULL); #ifndef MMCCAM MMC_DECLARE_BRIDGE(rockchip_dwmmc); #endif diff --git a/sys/dev/mmc/host/dwmmc_samsung.c b/sys/dev/mmc/host/dwmmc_samsung.c index 4443cda58736..6d8bbd96a220 100644 --- a/sys/dev/mmc/host/dwmmc_samsung.c +++ b/sys/dev/mmc/host/dwmmc_samsung.c @@ -120,15 +120,11 @@ static device_method_t samsung_dwmmc_methods[] = { DEVMETHOD_END }; -static devclass_t samsung_dwmmc_devclass; - DEFINE_CLASS_1(samsung_dwmmc, samsung_dwmmc_driver, samsung_dwmmc_methods, sizeof(struct dwmmc_softc), dwmmc_driver); -DRIVER_MODULE(samsung_dwmmc, simplebus, samsung_dwmmc_driver, - samsung_dwmmc_devclass, 0, 0); -DRIVER_MODULE(samsung_dwmmc, ofwbus, samsung_dwmmc_driver, samsung_dwmmc_devclass - , NULL, NULL); +DRIVER_MODULE(samsung_dwmmc, simplebus, samsung_dwmmc_driver, 0, 0); +DRIVER_MODULE(samsung_dwmmc, ofwbus, samsung_dwmmc_driver, NULL, NULL); #ifndef MMCCAM MMC_DECLARE_BRIDGE(samsung_dwmmc); #endif diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index 9c73dfd57ce0..5fce6cbf47a1 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -2569,6 +2569,5 @@ driver_t mmc_driver = { mmc_methods, sizeof(struct mmc_softc), }; -devclass_t mmc_devclass; MODULE_VERSION(mmc, MMC_VERSION); diff --git a/sys/dev/mmc/mmc_pwrseq.c b/sys/dev/mmc/mmc_pwrseq.c index d4ccf814fe53..2a5a9e056a3d 100644 --- a/sys/dev/mmc/mmc_pwrseq.c +++ b/sys/dev/mmc/mmc_pwrseq.c @@ -186,9 +186,7 @@ static driver_t mmc_pwrseq_driver = { sizeof(struct mmc_pwrseq_softc), }; -static devclass_t mmc_pwrseq_devclass; - -EARLY_DRIVER_MODULE(mmc_pwrseq, simplebus, mmc_pwrseq_driver, mmc_pwrseq_devclass, 0, 0, +EARLY_DRIVER_MODULE(mmc_pwrseq, simplebus, mmc_pwrseq_driver, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_FIRST); MODULE_VERSION(mmc_pwrseq, 1); SIMPLEBUS_PNP_INFO(compat_data); diff --git a/sys/dev/mmc/mmcsd.c b/sys/dev/mmc/mmcsd.c index 5e821586f722..34ec380a280e 100644 --- a/sys/dev/mmc/mmcsd.c +++ b/sys/dev/mmc/mmcsd.c @@ -1555,7 +1555,6 @@ static driver_t mmcsd_driver = { mmcsd_methods, sizeof(struct mmcsd_softc), }; -static devclass_t mmcsd_devclass; static int mmcsd_handler(module_t mod __unused, int what, void *arg __unused) @@ -1573,6 +1572,6 @@ mmcsd_handler(module_t mod __unused, int what, void *arg __unused) return (0); } -DRIVER_MODULE(mmcsd, mmc, mmcsd_driver, mmcsd_devclass, mmcsd_handler, NULL); +DRIVER_MODULE(mmcsd, mmc, mmcsd_driver, mmcsd_handler, NULL); MODULE_DEPEND(mmcsd, g_flashmap, 0, 0, 0); MMC_DEPEND(mmcsd); diff --git a/sys/dev/mmcnull/mmcnull.c b/sys/dev/mmcnull/mmcnull.c index 6abaf17c6d72..79e2ce9c431f 100644 --- a/sys/dev/mmcnull/mmcnull.c +++ b/sys/dev/mmcnull/mmcnull.c @@ -458,6 +458,4 @@ static driver_t mmcnull_driver = { "mmcnull", mmcnull_methods, sizeof(struct mmcnull_softc) }; -static devclass_t mmcnull_devclass; - -DRIVER_MODULE(mmcnull, isa, mmcnull_driver, mmcnull_devclass, 0, 0); +DRIVER_MODULE(mmcnull, isa, mmcnull_driver, 0, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205062243.246Mhikw020084>