From nobody Fri May 06 22:43:44 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 479931AB9FF9; Fri, 6 May 2022 22:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kw5Fr5zQHz3vp2; Fri, 6 May 2022 22:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NlPNIIEFRnW0nsNzAvdq0xTqiZTa+c3fy+ReWt5i2s=; b=CZAS56Ze9CRVuoIjpAsIsPw+gWqPUYF63DmbZVroznHzcfy3lNCP2qvsjskBfl9Zhc1fs6 qo8Kyy8H+RnuabbSVIhxr4Qh7xmVPZbLKjVbSY2usdvyUUq/RkXEeI1MkasuLyIoHs4uek fgbK/kXH80n8+cJxSe8tqDD5ANBvu6Fotr8Tbff10lluapfKB5rlk+0gm6NhWpU6apVRxQ 9RA9Pu98tygnLDomtbh629BQzL8eCc/AOYmX059S3VqZLxn7AMeP+zjiV9ZPKWZyPgZRs6 kNeLGiIW62jdKOuKoz75MnvMtTwN9oh3LYkgTCUCbbbMePFpOhLEQ5etXAVuLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A520F249A2; Fri, 6 May 2022 22:43:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 246Mhi5Z020085; Fri, 6 May 2022 22:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Mhikw020084; Fri, 6 May 2022 22:43:44 GMT (envelope-from git) Date: Fri, 6 May 2022 22:43:44 GMT Message-Id: <202205062243.246Mhikw020084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b58c5abf075f - main - mmc: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b58c5abf075fcbfc515a353113470374ffc95b6f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651877025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+NlPNIIEFRnW0nsNzAvdq0xTqiZTa+c3fy+ReWt5i2s=; b=sF8IQvi6PNQGqKOfPKpxwlWRckvg/51Hj3mrcpnGjZgtugA7WNEu5bC+QDhnnjJkKC+vht gaGoqelWIKxWt5YBSD/nvbZ+Cz+vfkTm2/VIJ64A8ewwnL+p7Z1BU115jHpndEwS2aFaYa zLiXduLtkGUdp3QavS/QyK9hUNF2km8PtVYZmYBwRUKhvckDJeC405tHysXYG3WFv7uPVR 5fQsEjx0WPtLwBQXPUrCzDS6d4Jrt+sbI//z9o2z0hvta+sKlqJwrYFW1xqNBAcOBu31jN dZ4Fk7Q9qy0bqdzTpiee+MZzcT3HRzh4QyiTbcijKigcemVNbfrSnzVy5cEMaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651877025; a=rsa-sha256; cv=none; b=mOe1qd/q/puoetvfb9TtGYegeJeybHF7oARoXrw73bC3sqVu0sgonbH12hrhqo5I5TPonf uSqvgPLamd7oDw40IPGydBL820976KPE60fNCqHZ02UC32TLj2ydCjFyjicYE4KfqlTGOi Y0ezq401PrrHK1wUf7wYdu3Z54Z75mdKliMHKhoEa3yf10cLoPntnHBfj3psjuhC3ldCOJ RAdeYYSXB/sK/U48Je5K19hZEl612Bmrsfi6gopF4sRhY9Y8qkXC6aDjiQ5U0O+lvVx+qc 9SXXjkVWD0uI7ek6bibPQ6WB3qm+S5OL5OCQNiDlvoUp35wlk+wB21gmfyOlBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b58c5abf075fcbfc515a353113470374ffc95b6f commit b58c5abf075fcbfc515a353113470374ffc95b6f Author: John Baldwin AuthorDate: 2022-04-20 17:01:11 +0000 Commit: John Baldwin 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);