From nobody Mon May 9 21:48:01 2022 X-Original-To: dev-commits-src-all@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 B06E41ACA707; Mon, 9 May 2022 21:48:02 +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 4Kxvt95JkGz3H3T; Mon, 9 May 2022 21:48:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132881; 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=uL9Y6Eh/mIGkX0K7C5FFONwWf78x+LaMt6R3iGyAseQ=; b=KGJgl+S7YCHFVtl6Vvjq/NJru4TmzQK/Wa8l8x5N/vLiwGoZ+satC8TFL0sWjy57ddEcYp d2alkCJ1Fkf1j/EaO9BpnupL1+qef8TsbLkIkf1w2mrmXtRXEr7NLiokwyEhNbByMgAInH TBeuChkRovQ6NwHQIsFBFlbb66svL/0y78lIqkCnSUuyK5+kPVzxGAAKS/6C6CiqoIVDAX /r7QaNAzAcRXA6E2Z7MGen8sEk/YsWd2QlVN4UA4jA+vDPVlVx9fDSGBtIwsamfKtQEsgp odJsvkyYQM5stkgZWzgwytKGdvJdNMfKGYG4sRQWmsrugBabx+a//lwke4vdxg== 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 5F8A418EA4; Mon, 9 May 2022 21:48:01 +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 249Lm1Zc080447; Mon, 9 May 2022 21:48:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249Lm17n080446; Mon, 9 May 2022 21:48:01 GMT (envelope-from git) Date: Mon, 9 May 2022 21:48:01 GMT Message-Id: <202205092148.249Lm17n080446@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: b2c1681aa155 - main - arm64 rockchip: Remove unused devclass arguments to DRIVER_MODULE. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: b2c1681aa155b3cd577cd3a24c50fd053f02ade2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132881; 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=uL9Y6Eh/mIGkX0K7C5FFONwWf78x+LaMt6R3iGyAseQ=; b=ChYgOptg/Xs75BUUEmLFvZtPjqE7E4bK9urTkM+sQ2KltCVCqGM92vmhV+vwNSjw/3Oofc 1nJQeiFs38N1XT3+gl+SyavGCzzABaaB69W/dxkpfHrlrqSXPji2oy9B1uTkNZ/8xNZVEt Y/keZuyUQwkfrlvd8E1weD2vmJwFKJOfi9Wm2ZLpMcxhY1PcRHVEKSz0/PiwPg5PGPHfB7 tXOfdOZdJaGCx0WUqgptkC1lIWt5YP2jrza3iEKv7ACbB1+9C+d/XAotxPY6eCajmcSQEL 2fWQxl7LDtLqvydzhKF85z5Ufxmd29kQb/szUtkAmhrxnxhgxgpq7u5iDZGV6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652132881; a=rsa-sha256; cv=none; b=j2i3eAKtgTeyJSq630YU708qKVr+bpMk/qzQPGPax874P3ylT6Wqhh+V4Qdc1yHwULlAQU c3fTWd+iIj/Gmy/VdmsZKtCEGgHFUT52M8svc/Va3dDi2L2XADKiUnHlJHOT+uPFQ9s0vY +hGylA5yd9DmTVbRsjIm+8diWQ27dwTRA46RHocpsI1UEV4ze7vnWijDyMVFa8Z6JMutGR D2i9FZFZWU1cXJiZ5VWS+TyRXAL7AbLw4KzFvrWYveWhsP4fXGq1tQDQEBeNj0j7pMflHW FyE+mG/qJOlHJxX3Wocyrnbox6LNKlRmCyR5gqEBrdYHz3R9qUOlxlalQPXXbg== 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=b2c1681aa155b3cd577cd3a24c50fd053f02ade2 commit b2c1681aa155b3cd577cd3a24c50fd053f02ade2 Author: John Baldwin AuthorDate: 2022-05-09 21:26:45 +0000 Commit: John Baldwin CommitDate: 2022-05-09 21:26:45 +0000 arm64 rockchip: Remove unused devclass arguments to DRIVER_MODULE. --- sys/arm64/rockchip/clk/rk3288_cru.c | 6 ++---- sys/arm64/rockchip/clk/rk3328_cru.c | 6 ++---- sys/arm64/rockchip/clk/rk3399_cru.c | 6 ++---- sys/arm64/rockchip/clk/rk3399_pmucru.c | 6 ++---- sys/arm64/rockchip/if_dwc_rk.c | 4 +--- sys/arm64/rockchip/rk3328_codec.c | 4 +--- sys/arm64/rockchip/rk3399_emmcphy.c | 5 ++--- sys/arm64/rockchip/rk_dwc3.c | 4 +--- sys/arm64/rockchip/rk_gpio.c | 6 ++---- sys/arm64/rockchip/rk_grf.c | 5 ++--- sys/arm64/rockchip/rk_i2c.c | 4 +--- sys/arm64/rockchip/rk_i2s.c | 4 +--- sys/arm64/rockchip/rk_iodomain.c | 6 ++---- sys/arm64/rockchip/rk_pcie.c | 4 +--- sys/arm64/rockchip/rk_pcie_phy.c | 4 +--- sys/arm64/rockchip/rk_pinctrl.c | 6 ++---- sys/arm64/rockchip/rk_pmu.c | 5 ++--- sys/arm64/rockchip/rk_pwm.c | 4 +--- sys/arm64/rockchip/rk_spi.c | 4 +--- sys/arm64/rockchip/rk_tsadc.c | 5 ++--- sys/arm64/rockchip/rk_typec_phy.c | 5 ++--- sys/arm64/rockchip/rk_usb2phy.c | 5 ++--- sys/arm64/rockchip/rk_usbphy.c | 5 ++--- 23 files changed, 37 insertions(+), 76 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk3288_cru.c b/sys/arm64/rockchip/clk/rk3288_cru.c index 3f4a59864545..0a2fa33af857 100644 --- a/sys/arm64/rockchip/clk/rk3288_cru.c +++ b/sys/arm64/rockchip/clk/rk3288_cru.c @@ -918,10 +918,8 @@ static device_method_t rk3288_cru_methods[] = { DEVMETHOD_END }; -static devclass_t rk3288_cru_devclass; - DEFINE_CLASS_1(rk3288_cru, rk3288_cru_driver, rk3288_cru_methods, sizeof(struct rk_cru_softc), rk_cru_driver); -EARLY_DRIVER_MODULE(rk3288_cru, simplebus, rk3288_cru_driver, - rk3288_cru_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE + 1); +EARLY_DRIVER_MODULE(rk3288_cru, simplebus, rk3288_cru_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE + 1); diff --git a/sys/arm64/rockchip/clk/rk3328_cru.c b/sys/arm64/rockchip/clk/rk3328_cru.c index 63c8797f6b44..4708b9baec33 100644 --- a/sys/arm64/rockchip/clk/rk3328_cru.c +++ b/sys/arm64/rockchip/clk/rk3328_cru.c @@ -1114,10 +1114,8 @@ static device_method_t rk3328_cru_methods[] = { DEVMETHOD_END }; -static devclass_t rk3328_cru_devclass; - DEFINE_CLASS_1(rk3328_cru, rk3328_cru_driver, rk3328_cru_methods, sizeof(struct rk_cru_softc), rk_cru_driver); -EARLY_DRIVER_MODULE(rk3328_cru, simplebus, rk3328_cru_driver, - rk3328_cru_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk3328_cru, simplebus, rk3328_cru_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/clk/rk3399_cru.c b/sys/arm64/rockchip/clk/rk3399_cru.c index 585f6d4c33b9..296d68e1091a 100644 --- a/sys/arm64/rockchip/clk/rk3399_cru.c +++ b/sys/arm64/rockchip/clk/rk3399_cru.c @@ -1269,10 +1269,8 @@ static device_method_t rk3399_cru_methods[] = { DEVMETHOD_END }; -static devclass_t rk3399_cru_devclass; - DEFINE_CLASS_1(rk3399_cru, rk3399_cru_driver, rk3399_cru_methods, sizeof(struct rk_cru_softc), rk_cru_driver); -EARLY_DRIVER_MODULE(rk3399_cru, simplebus, rk3399_cru_driver, - rk3399_cru_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk3399_cru, simplebus, rk3399_cru_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/clk/rk3399_pmucru.c b/sys/arm64/rockchip/clk/rk3399_pmucru.c index 3327117b98a1..3092e265a7f4 100644 --- a/sys/arm64/rockchip/clk/rk3399_pmucru.c +++ b/sys/arm64/rockchip/clk/rk3399_pmucru.c @@ -860,10 +860,8 @@ static device_method_t rk3399_pmucru_methods[] = { DEVMETHOD_END }; -static devclass_t rk3399_pmucru_devclass; - DEFINE_CLASS_1(rk3399_pmucru, rk3399_pmucru_driver, rk3399_pmucru_methods, sizeof(struct rk_cru_softc), rk_cru_driver); -EARLY_DRIVER_MODULE(rk3399_pmucru, simplebus, rk3399_pmucru_driver, - rk3399_pmucru_devclass, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk3399_pmucru, simplebus, rk3399_pmucru_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/if_dwc_rk.c b/sys/arm64/rockchip/if_dwc_rk.c index eafd9e00caf0..9257eba1e9ba 100644 --- a/sys/arm64/rockchip/if_dwc_rk.c +++ b/sys/arm64/rockchip/if_dwc_rk.c @@ -615,11 +615,9 @@ static device_method_t if_dwc_rk_methods[] = { DEVMETHOD_END }; -static devclass_t dwc_rk_devclass; - extern driver_t dwc_driver; DEFINE_CLASS_1(dwc, dwc_rk_driver, if_dwc_rk_methods, sizeof(struct if_dwc_rk_softc), dwc_driver); -DRIVER_MODULE(dwc_rk, simplebus, dwc_rk_driver, dwc_rk_devclass, 0, 0); +DRIVER_MODULE(dwc_rk, simplebus, dwc_rk_driver, 0, 0); MODULE_DEPEND(dwc_rk, dwc, 1, 1, 1); diff --git a/sys/arm64/rockchip/rk3328_codec.c b/sys/arm64/rockchip/rk3328_codec.c index 2a5f652fa8c2..4a76b4dd044b 100644 --- a/sys/arm64/rockchip/rk3328_codec.c +++ b/sys/arm64/rockchip/rk3328_codec.c @@ -606,7 +606,5 @@ static driver_t rkcodec_driver = { sizeof(struct rkcodec_softc), }; -static devclass_t rkcodec_devclass; - -DRIVER_MODULE(rkcodec, simplebus, rkcodec_driver, rkcodec_devclass, 0, 0); +DRIVER_MODULE(rkcodec, simplebus, rkcodec_driver, 0, 0); SIMPLEBUS_PNP_INFO(compat_data); diff --git a/sys/arm64/rockchip/rk3399_emmcphy.c b/sys/arm64/rockchip/rk3399_emmcphy.c index 533ccb0b2c8f..4ebd4135ad78 100644 --- a/sys/arm64/rockchip/rk3399_emmcphy.c +++ b/sys/arm64/rockchip/rk3399_emmcphy.c @@ -335,7 +335,6 @@ static driver_t rk_emmcphy_driver = { sizeof(struct rk_emmcphy_softc) }; -static devclass_t rk_emmcphy_devclass; -EARLY_DRIVER_MODULE(rk_emmcphy, simplebus, rk_emmcphy_driver, - rk_emmcphy_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_emmcphy, simplebus, rk_emmcphy_driver, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_emmcphy, 1); diff --git a/sys/arm64/rockchip/rk_dwc3.c b/sys/arm64/rockchip/rk_dwc3.c index d63ba67907f8..a443438511ab 100644 --- a/sys/arm64/rockchip/rk_dwc3.c +++ b/sys/arm64/rockchip/rk_dwc3.c @@ -202,8 +202,6 @@ static device_method_t rk_dwc3_methods[] = { DEVMETHOD_END }; -static devclass_t rk_dwc3_devclass; - DEFINE_CLASS_1(rk_dwc3, rk_dwc3_driver, rk_dwc3_methods, sizeof(struct rk_dwc3_softc), simplebus_driver); -DRIVER_MODULE(rk_dwc3, simplebus, rk_dwc3_driver, rk_dwc3_devclass, 0, 0); +DRIVER_MODULE(rk_dwc3, simplebus, rk_dwc3_driver, 0, 0); diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index d3623b2302ec..b695797f153e 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -466,12 +466,10 @@ static driver_t rk_gpio_driver = { sizeof(struct rk_gpio_softc), }; -static devclass_t rk_gpio_devclass; - /* * GPIO driver is always a child of rk_pinctrl driver and should be probed * and attached within rk_pinctrl_attach function. Due to this, bus pass order * must be same as bus pass order of rk_pinctrl driver. */ -EARLY_DRIVER_MODULE(rk_gpio, simplebus, rk_gpio_driver, - rk_gpio_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_gpio, simplebus, rk_gpio_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/rk_grf.c b/sys/arm64/rockchip/rk_grf.c index d55bdd04e861..3d54a79de29e 100644 --- a/sys/arm64/rockchip/rk_grf.c +++ b/sys/arm64/rockchip/rk_grf.c @@ -73,7 +73,6 @@ static device_method_t rk_grf_methods[] = { DEFINE_CLASS_1(rk_grf, rk_grf_driver, rk_grf_methods, sizeof(struct simple_mfd_softc), simple_mfd_driver); -static devclass_t rk_grf_devclass; -EARLY_DRIVER_MODULE(rk_grf, simplebus, rk_grf_driver, rk_grf_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_grf, simplebus, rk_grf_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_grf, 1); diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index d1b38158bf37..fe8a2e49a5b5 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -726,9 +726,7 @@ static driver_t rk_i2c_driver = { sizeof(struct rk_i2c_softc), }; -static devclass_t rk_i2c_devclass; - -EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, rk_i2c_devclass, 0, 0, +EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); diff --git a/sys/arm64/rockchip/rk_i2s.c b/sys/arm64/rockchip/rk_i2s.c index 450c2c6e2b77..32413b5307b4 100644 --- a/sys/arm64/rockchip/rk_i2s.c +++ b/sys/arm64/rockchip/rk_i2s.c @@ -652,7 +652,5 @@ static driver_t rk_i2s_driver = { sizeof(struct rk_i2s_softc), }; -static devclass_t rk_i2s_devclass; - -DRIVER_MODULE(rk_i2s, simplebus, rk_i2s_driver, rk_i2s_devclass, 0, 0); +DRIVER_MODULE(rk_i2s, simplebus, rk_i2s_driver, 0, 0); SIMPLEBUS_PNP_INFO(compat_data); diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c index df773012fe4e..183332208cd9 100644 --- a/sys/arm64/rockchip/rk_iodomain.c +++ b/sys/arm64/rockchip/rk_iodomain.c @@ -216,7 +216,5 @@ static driver_t rk_iodomain_driver = { sizeof(struct rk_iodomain_softc), }; -static devclass_t rk_iodomain_devclass; - -EARLY_DRIVER_MODULE(rk_iodomain, simplebus, rk_iodomain_driver, - rk_iodomain_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_iodomain, simplebus, rk_iodomain_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/rk_pcie.c b/sys/arm64/rockchip/rk_pcie.c index b9dc640efb8b..8d07cad84e6d 100644 --- a/sys/arm64/rockchip/rk_pcie.c +++ b/sys/arm64/rockchip/rk_pcie.c @@ -1384,6 +1384,4 @@ static device_method_t rk_pcie_methods[] = { DEFINE_CLASS_1(pcib, rk_pcie_driver, rk_pcie_methods, sizeof(struct rk_pcie_softc), ofw_pcib_driver); -static devclass_t rk_pcie_devclass; -DRIVER_MODULE( rk_pcie, simplebus, rk_pcie_driver, rk_pcie_devclass, - NULL, NULL); +DRIVER_MODULE( rk_pcie, simplebus, rk_pcie_driver, NULL, NULL); diff --git a/sys/arm64/rockchip/rk_pcie_phy.c b/sys/arm64/rockchip/rk_pcie_phy.c index d01aa930906b..e868baa01291 100644 --- a/sys/arm64/rockchip/rk_pcie_phy.c +++ b/sys/arm64/rockchip/rk_pcie_phy.c @@ -364,7 +364,5 @@ static device_method_t rk_pcie_phy_methods[] = { DEFINE_CLASS_0(rk_pcie_phy, rk_pcie_phy_driver, rk_pcie_phy_methods, sizeof(struct rk_pcie_phy_softc)); -static devclass_t rk_pcie_phy_devclass; -EARLY_DRIVER_MODULE(rk_pcie_phy, simplebus, rk_pcie_phy_driver, - rk_pcie_phy_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(rk_pcie_phy, simplebus, rk_pcie_phy_driver, NULL, NULL, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index 21ab984aca5a..a6561658ba92 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -1337,11 +1337,9 @@ static device_method_t rk_pinctrl_methods[] = { DEVMETHOD_END }; -static devclass_t rk_pinctrl_devclass; - DEFINE_CLASS_1(rk_pinctrl, rk_pinctrl_driver, rk_pinctrl_methods, sizeof(struct rk_pinctrl_softc), simplebus_driver); -EARLY_DRIVER_MODULE(rk_pinctrl, simplebus, rk_pinctrl_driver, - rk_pinctrl_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_pinctrl, simplebus, rk_pinctrl_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_pinctrl, 1); diff --git a/sys/arm64/rockchip/rk_pmu.c b/sys/arm64/rockchip/rk_pmu.c index fcd1242f8c6f..08d1f837b714 100644 --- a/sys/arm64/rockchip/rk_pmu.c +++ b/sys/arm64/rockchip/rk_pmu.c @@ -71,7 +71,6 @@ static device_method_t rk_pmu_methods[] = { DEFINE_CLASS_1(rk_pmu, rk_pmu_driver, rk_pmu_methods, sizeof(struct simple_mfd_softc), simple_mfd_driver); -static devclass_t rk_pmu_devclass; -EARLY_DRIVER_MODULE(rk_pmu, simplebus, rk_pmu_driver, rk_pmu_devclass, - 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_pmu, simplebus, rk_pmu_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_pmu, 1); diff --git a/sys/arm64/rockchip/rk_pwm.c b/sys/arm64/rockchip/rk_pwm.c index f7f2cd8cbeef..7f78dd2558ad 100644 --- a/sys/arm64/rockchip/rk_pwm.c +++ b/sys/arm64/rockchip/rk_pwm.c @@ -398,7 +398,5 @@ static driver_t rk_pwm_driver = { sizeof(struct rk_pwm_softc), }; -static devclass_t rk_pwm_devclass; - -DRIVER_MODULE(rk_pwm, simplebus, rk_pwm_driver, rk_pwm_devclass, 0, 0); +DRIVER_MODULE(rk_pwm, simplebus, rk_pwm_driver, 0, 0); SIMPLEBUS_PNP_INFO(compat_data); diff --git a/sys/arm64/rockchip/rk_spi.c b/sys/arm64/rockchip/rk_spi.c index f0db4c70b895..fbfeb70a3fa7 100644 --- a/sys/arm64/rockchip/rk_spi.c +++ b/sys/arm64/rockchip/rk_spi.c @@ -476,9 +476,7 @@ static driver_t rk_spi_driver = { sizeof(struct rk_spi_softc), }; -static devclass_t rk_spi_devclass; - -DRIVER_MODULE(rk_spi, simplebus, rk_spi_driver, rk_spi_devclass, 0, 0); +DRIVER_MODULE(rk_spi, simplebus, rk_spi_driver, 0, 0); DRIVER_MODULE(ofw_spibus, rk_spi, ofw_spibus_driver, 0, 0); MODULE_DEPEND(rk_spi, ofw_spibus, 1, 1, 1); OFWBUS_PNP_INFO(compat_data); diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c index 54e6dabdfb8c..9d5d887e27fb 100644 --- a/sys/arm64/rockchip/rk_tsadc.c +++ b/sys/arm64/rockchip/rk_tsadc.c @@ -786,8 +786,7 @@ static device_method_t rk_tsadc_methods[] = { DEVMETHOD_END }; -static devclass_t rk_tsadc_devclass; static DEFINE_CLASS_0(rk_tsadc, rk_tsadc_driver, rk_tsadc_methods, sizeof(struct tsadc_softc)); -EARLY_DRIVER_MODULE(rk_tsadc, simplebus, rk_tsadc_driver, - rk_tsadc_devclass, NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(rk_tsadc, simplebus, rk_tsadc_driver, NULL, NULL, + BUS_PASS_TIMER + BUS_PASS_ORDER_LAST); diff --git a/sys/arm64/rockchip/rk_typec_phy.c b/sys/arm64/rockchip/rk_typec_phy.c index 35e677e3bfee..55fc777db6a2 100644 --- a/sys/arm64/rockchip/rk_typec_phy.c +++ b/sys/arm64/rockchip/rk_typec_phy.c @@ -468,7 +468,6 @@ static driver_t rk_typec_phy_driver = { sizeof(struct rk_typec_phy_softc) }; -static devclass_t rk_typec_phy_devclass; -EARLY_DRIVER_MODULE(rk_typec_phy, simplebus, rk_typec_phy_driver, - rk_typec_phy_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_typec_phy, simplebus, rk_typec_phy_driver, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_typec_phy, 1); diff --git a/sys/arm64/rockchip/rk_usb2phy.c b/sys/arm64/rockchip/rk_usb2phy.c index 72315f1475ab..b7ba19488f85 100644 --- a/sys/arm64/rockchip/rk_usb2phy.c +++ b/sys/arm64/rockchip/rk_usb2phy.c @@ -411,7 +411,6 @@ static driver_t rk_usb2phy_driver = { sizeof(struct rk_usb2phy_softc) }; -static devclass_t rk_usb2phy_devclass; -EARLY_DRIVER_MODULE(rk_usb2phy, simplebus, rk_usb2phy_driver, - rk_usb2phy_devclass, 0, 0, BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); +EARLY_DRIVER_MODULE(rk_usb2phy, simplebus, rk_usb2phy_driver, 0, 0, + BUS_PASS_SUPPORTDEV + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(rk_usb2phy, 1); diff --git a/sys/arm64/rockchip/rk_usbphy.c b/sys/arm64/rockchip/rk_usbphy.c index 7d53ba5322c5..af2a25502bce 100644 --- a/sys/arm64/rockchip/rk_usbphy.c +++ b/sys/arm64/rockchip/rk_usbphy.c @@ -297,8 +297,7 @@ static device_method_t rk_usbphy_methods[] = { DEVMETHOD_END }; -static devclass_t rk_usbphy_devclass; static DEFINE_CLASS_0(rk_usbphy, rk_usbphy_driver, rk_usbphy_methods, sizeof(struct rk_usbphy_softc)); -EARLY_DRIVER_MODULE(rk_usbphy, simplebus, rk_usbphy_driver, - rk_usbphy_devclass, NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_LAST); +EARLY_DRIVER_MODULE(rk_usbphy, simplebus, rk_usbphy_driver, NULL, NULL, + BUS_PASS_TIMER + BUS_PASS_ORDER_LAST);