From nobody Tue May 10 17:36:22 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 341F81AD0288; Tue, 10 May 2022 17:36:23 +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 4KyQFL2xV1z4hcc; Tue, 10 May 2022 17:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204183; 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=aPgw/SUpWWatwvolhOnotMVSomPZvjhyB2+U1qJCgEI=; b=G6hN6l67+8NjLwes8QKCv05UrHDqvAnuGsusDn2t2a7xzs+YsKbzEkALTStEviaCFs/fPK d1A5fwe5eGfKGjC6sOr8eM028iapA7XHuVtIu2Esa916G4mNjjof+1REEDcSeuD6pqyvoo d2nNW7CBXSUJpJX2UPfTQ4+Vt/Xv2FTy40YCkCJczPG7eVdiQP9ySuILPYZkRfVfrw2nZG PAOCsTsC6kectW0K551Ava5EsSrImz9FULajO504qOMXwuoX+YCuH1uF8OCOE14jjVPxL/ aSnLFC7PVkvSs016AWeawI5C68kGEl2uw6tELERBLAFRYjNnG+MxoD4uDBLoSw== 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 310601C8A; Tue, 10 May 2022 17:36:22 +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 24AHaMoO099004; Tue, 10 May 2022 17:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AHaMPo099003; Tue, 10 May 2022 17:36:22 GMT (envelope-from git) Date: Tue, 10 May 2022 17:36:22 GMT Message-Id: <202205101736.24AHaMPo099003@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: 5d7d6129f4ba - main - powerpc mpc85xx: 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: 5d7d6129f4baa4584644a915a9bd01d56574330b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204183; 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=aPgw/SUpWWatwvolhOnotMVSomPZvjhyB2+U1qJCgEI=; b=GFeSa2Z7U3wSdUnL4Zj2bj+e1YS5k8oJfxA+aPBymD1y/QKsqAYae3Yn4dQHmLWEYFcL5w FnT3Jq9MfOhG1vYeErMvmZrz1PKKpJHV+ZG6s5wySIXCkEBZsmM/nhrn7N46yHKObkiXE1 MNTXra3frjV2Kp1nIPR7GJVpgOUPfzwozngzDXFwEyxpxkXGRJvqJVrExrjbwXGyknjA7v mswBe9UaPZoKV1/nysL8yLPbQzYPZK68pzNtwP7A4lMmt63a32H0NmPURhBXz2/wFyzxPj ZEPcWAY8dM0cmXJn8mA1OHojqmtkbu/TPleI5jhnv2QMJ+OjmI0zOJD4eLypvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652204183; a=rsa-sha256; cv=none; b=Jhn8IZFkVMJzLyTgeeyTbmNo9iJGm8mEdGMUfqFtdOK/oOydHO4Ftuo5KLNzC4A9bsgy2g cjZFpQ6zaoKcK06U1+x0zpoXV1NRyZbPqkLkN1j6kCK/IJtgMCtW1wlq7pFYGS4rPJiL5j FeGfSyldiMQ5qom/mXAPNyHKE58vBIX0fcG39APlJcux3wsCVgOij/BvTMmToj+4XOlnN2 OjcUCiGusIekJ7Cz/hvd2IlINRc5HCQJSV7VniKZpX1z74yCmi0MUnRAbQ/CmhaM3hEQ5i 8OPJNkYDS2606tY1uZPivadO/zsIseG5gtq4ddYBdLXa3qvrp0nBv20Pn88UQA== 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=5d7d6129f4baa4584644a915a9bd01d56574330b commit 5d7d6129f4baa4584644a915a9bd01d56574330b Author: John Baldwin AuthorDate: 2022-05-10 17:21:38 +0000 Commit: John Baldwin CommitDate: 2022-05-10 17:21:38 +0000 powerpc mpc85xx: Remove unused devclass arguments to DRIVER_MODULE. --- sys/powerpc/mpc85xx/atpic.c | 4 +--- sys/powerpc/mpc85xx/ds1553_bus_fdt.c | 4 +--- sys/powerpc/mpc85xx/fsl_diu.c | 4 +--- sys/powerpc/mpc85xx/fsl_espi.c | 4 +--- sys/powerpc/mpc85xx/fsl_sata.c | 5 +++-- sys/powerpc/mpc85xx/i2c.c | 3 +-- sys/powerpc/mpc85xx/lbc.c | 5 +---- sys/powerpc/mpc85xx/mpc85xx_cache.c | 4 +--- sys/powerpc/mpc85xx/mpc85xx_gpio.c | 4 +--- sys/powerpc/mpc85xx/pci_mpc85xx.c | 9 ++------- sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c | 4 +--- sys/powerpc/mpc85xx/platform_mpc85xx.c | 12 ++++-------- 12 files changed, 18 insertions(+), 44 deletions(-) diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c index 793311b0de55..fbc11269ca92 100644 --- a/sys/powerpc/mpc85xx/atpic.c +++ b/sys/powerpc/mpc85xx/atpic.c @@ -110,14 +110,12 @@ static driver_t atpic_isa_driver = { sizeof(struct atpic_softc) }; -static devclass_t atpic_devclass; - static struct isa_pnp_id atpic_ids[] = { { 0x0000d041 /* PNP0000 */, "AT interrupt controller" }, { 0 } }; -DRIVER_MODULE(atpic, isa, atpic_isa_driver, atpic_devclass, 0, 0); +DRIVER_MODULE(atpic, isa, atpic_isa_driver, 0, 0); ISA_PNP_INFO(atpic_ids); static __inline uint8_t diff --git a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c index 021bd529fe74..c824c676a52b 100644 --- a/sys/powerpc/mpc85xx/ds1553_bus_fdt.c +++ b/sys/powerpc/mpc85xx/ds1553_bus_fdt.c @@ -51,8 +51,6 @@ __FBSDID("$FreeBSD$"); #include "ds1553_reg.h" #include "clock_if.h" -static devclass_t rtc_devclass; - static int rtc_attach(device_t dev); static int rtc_probe(device_t dev); @@ -73,7 +71,7 @@ static driver_t rtc_driver = { sizeof(struct ds1553_softc), }; -DRIVER_MODULE(rtc, lbc, rtc_driver, rtc_devclass, 0, 0); +DRIVER_MODULE(rtc, lbc, rtc_driver, 0, 0); static int rtc_probe(device_t dev) diff --git a/sys/powerpc/mpc85xx/fsl_diu.c b/sys/powerpc/mpc85xx/fsl_diu.c index c29df5e5393b..23750b6c8579 100644 --- a/sys/powerpc/mpc85xx/fsl_diu.c +++ b/sys/powerpc/mpc85xx/fsl_diu.c @@ -462,6 +462,4 @@ static driver_t diu_driver = { sizeof(struct diu_softc), }; -static devclass_t diu_devclass; - -DRIVER_MODULE(fb, simplebus, diu_driver, diu_devclass, 0, 0); +DRIVER_MODULE(fb, simplebus, diu_driver, 0, 0); diff --git a/sys/powerpc/mpc85xx/fsl_espi.c b/sys/powerpc/mpc85xx/fsl_espi.c index b27ddf8ddac8..f466b598ac8e 100644 --- a/sys/powerpc/mpc85xx/fsl_espi.c +++ b/sys/powerpc/mpc85xx/fsl_espi.c @@ -423,12 +423,10 @@ static device_method_t fsl_espi_methods[] = { DEVMETHOD_END }; -static devclass_t fsl_espi_devclass; - static driver_t fsl_espi_driver = { "spi", fsl_espi_methods, sizeof(struct fsl_espi_softc), }; -DRIVER_MODULE(fsl_espi, simplebus, fsl_espi_driver, fsl_espi_devclass, 0, 0); +DRIVER_MODULE(fsl_espi, simplebus, fsl_espi_driver, 0, 0); diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 49e3846e79ca..ffd340a557d8 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -544,7 +544,6 @@ fsl_sata_resume(device_t dev) return (0); } -devclass_t fsl_satach_devclass; static device_method_t fsl_satach_methods[] = { DEVMETHOD(device_probe, fsl_sata_probe), DEVMETHOD(device_attach, fsl_sata_attach), @@ -553,12 +552,14 @@ static device_method_t fsl_satach_methods[] = { DEVMETHOD(device_resume, fsl_sata_resume), DEVMETHOD_END }; + static driver_t fsl_satach_driver = { "fslsata", fsl_satach_methods, sizeof(struct fsl_sata_channel) }; -DRIVER_MODULE(fsl_satach, simplebus, fsl_satach_driver, fsl_satach_devclass, NULL, NULL); + +DRIVER_MODULE(fsl_satach, simplebus, fsl_satach_driver, NULL, NULL); struct fsl_sata_dc_cb_args { bus_addr_t maddr; diff --git a/sys/powerpc/mpc85xx/i2c.c b/sys/powerpc/mpc85xx/i2c.c index f96fc6a53f43..74ccae620b87 100644 --- a/sys/powerpc/mpc85xx/i2c.c +++ b/sys/powerpc/mpc85xx/i2c.c @@ -122,9 +122,8 @@ static driver_t i2c_driver = { i2c_methods, sizeof(struct i2c_softc), }; -static devclass_t i2c_devclass; -DRIVER_MODULE(i2c, simplebus, i2c_driver, i2c_devclass, 0, 0); +DRIVER_MODULE(i2c, simplebus, i2c_driver, 0, 0); DRIVER_MODULE(iicbus, i2c, iicbus_driver, 0, 0); static __inline void diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index f79161c25282..b7178fdade54 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -119,10 +119,7 @@ static driver_t lbc_driver = { sizeof(struct lbc_softc) }; -devclass_t lbc_devclass; - -EARLY_DRIVER_MODULE(lbc, ofwbus, lbc_driver, lbc_devclass, - 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(lbc, ofwbus, lbc_driver, 0, 0, BUS_PASS_BUS); /* * Calculate address mask used by OR(n) registers. Use memory region size to diff --git a/sys/powerpc/mpc85xx/mpc85xx_cache.c b/sys/powerpc/mpc85xx/mpc85xx_cache.c index 575b50eb88a4..dd2c9f53da3f 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_cache.c +++ b/sys/powerpc/mpc85xx/mpc85xx_cache.c @@ -157,8 +157,6 @@ static driver_t mpc85xx_cache_driver = { mpc85xx_cache_methods, sizeof(struct mpc85xx_cache_softc), }; -static devclass_t mpc85xx_cache_devclass; -EARLY_DRIVER_MODULE(mpc85xx_cache, simplebus, mpc85xx_cache_driver, - mpc85xx_cache_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(mpc85xx_cache, simplebus, mpc85xx_cache_driver, NULL, NULL, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c index 729a00b8e45d..857982c943ed 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c +++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c @@ -289,8 +289,6 @@ static driver_t mpc85xx_gpio_driver = { mpc85xx_gpio_methods, sizeof(struct mpc85xx_gpio_softc), }; -static devclass_t mpc85xx_gpio_devclass; -EARLY_DRIVER_MODULE(mpc85xx_gpio, simplebus, mpc85xx_gpio_driver, - mpc85xx_gpio_devclass, NULL, NULL, +EARLY_DRIVER_MODULE(mpc85xx_gpio, simplebus, mpc85xx_gpio_driver, NULL, NULL, BUS_PASS_RESOURCE + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c index b6f7867f7f74..5536024c9b2f 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c @@ -256,12 +256,9 @@ static device_method_t fsl_pcib_methods[] = { DEVMETHOD_END }; -static devclass_t fsl_pcib_devclass; - DEFINE_CLASS_1(pcib, fsl_pcib_driver, fsl_pcib_methods, sizeof(struct fsl_pcib_softc), ofw_pcib_driver); -EARLY_DRIVER_MODULE(pcib, ofwbus, fsl_pcib_driver, fsl_pcib_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(pcib, ofwbus, fsl_pcib_driver, 0, 0, BUS_PASS_BUS); static void fsl_pcib_err_intr(void *v) @@ -942,13 +939,11 @@ static device_method_t fsl_msi_methods[] = { DEVMETHOD_END }; -static devclass_t fsl_msi_devclass; - static driver_t fsl_msi_driver = { "fsl_msi", fsl_msi_methods, sizeof(struct fsl_msi_softc) }; -EARLY_DRIVER_MODULE(fsl_msi, simplebus, fsl_msi_driver, fsl_msi_devclass, 0, 0, +EARLY_DRIVER_MODULE(fsl_msi, simplebus, fsl_msi_driver, 0, 0, BUS_PASS_INTERRUPT + 1); diff --git a/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c b/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c index a1580712bbef..e56f01bfbaa5 100644 --- a/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c +++ b/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c @@ -102,8 +102,6 @@ static device_method_t fsl_pcib_rc_methods[] = { DEVMETHOD_END }; -static devclass_t fsl_pcib_rc_devclass; DEFINE_CLASS_1(pcib, fsl_pcib_rc_driver, fsl_pcib_rc_methods, sizeof(struct fsl_pcib_softc), ofw_pcib_pci_driver); -EARLY_DRIVER_MODULE(rcpcib, pci, fsl_pcib_rc_driver, fsl_pcib_rc_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(rcpcib, pci, fsl_pcib_rc_driver, 0, 0, BUS_PASS_BUS); diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c index bbb1870c6648..5e0415040e2a 100644 --- a/sys/powerpc/mpc85xx/platform_mpc85xx.c +++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c @@ -622,16 +622,14 @@ static device_method_t mpc85xx_rcpm_methods[] = { DEVMETHOD_END }; -static devclass_t mpc85xx_rcpm_devclass; - static driver_t mpc85xx_rcpm_driver = { "rcpm", mpc85xx_rcpm_methods, sizeof(struct mpc85xx_rcpm_softc) }; -EARLY_DRIVER_MODULE(mpc85xx_rcpm, simplebus, mpc85xx_rcpm_driver, - mpc85xx_rcpm_devclass, 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(mpc85xx_rcpm, simplebus, mpc85xx_rcpm_driver, 0, 0, + BUS_PASS_BUS); /* "Global utilities" power management/Timebase management. */ @@ -704,7 +702,5 @@ static driver_t mpc85xx_guts_driver = { sizeof(struct mpc85xx_guts_softc) }; -static devclass_t mpc85xx_guts_devclass; - -EARLY_DRIVER_MODULE(mpc85xx_guts, simplebus, mpc85xx_guts_driver, - mpc85xx_guts_devclass, 0, 0, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(mpc85xx_guts, simplebus, mpc85xx_guts_driver, 0, 0, + BUS_PASS_BUS);