From nobody Tue May 10 17:36:23 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 55CF41AD01D2; Tue, 10 May 2022 17:36:24 +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 4KyQFM5DsQz4hsT; Tue, 10 May 2022 17:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204184; 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=sEAnWBmlWY6qWg5opXOA1O/n0JlJKMvset1Hw5MMCmA=; b=OPrfi3CctljSgdFbswMVmTGlEk4lbVlYx67g9KSp+3OqRx39xwCd5uLQO+B++nA1ACoUHG M2XJ/gcBrg8F+hq/WDTnVxoFWW7P03GopIcvQFGH1L8Ti6LM6yoSi8EwfRboFOFzF3ijdr 0MWquOgLzP9qxB+SH9mGLWDNpxzXyPH6NsRfq6jVvJcI2Ewbf09JHU0lZZOXjoYQcsEsF1 Isa7in2RdhqwkGTq88PJppwXVESC0WwSBl7FT1+KIWlsXn1eEr6debaj6th/ajiI9ozNG3 UAmouxlTcL0LVmo5TybLq4i50dU3XQ1bwUWDT/ZIuR4zgOhKjSg/3t3UqRFQ/g== 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 58DE517F9; Tue, 10 May 2022 17:36:23 +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 24AHaNdv099028; Tue, 10 May 2022 17:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24AHaNnl099027; Tue, 10 May 2022 17:36:23 GMT (envelope-from git) Date: Tue, 10 May 2022 17:36:23 GMT Message-Id: <202205101736.24AHaNnl099027@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: 992ae60ba499 - main - powerpc powermac: 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: 992ae60ba4990c3f963052a8e77b8caffbdcf354 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652204184; 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=sEAnWBmlWY6qWg5opXOA1O/n0JlJKMvset1Hw5MMCmA=; b=mr4MVNIOvapP1G1J8qqBjTHj3RokJ5mVZmKhByl9ULO8liaG+LNx2me43TywEmSEFQgWHO nSND9PjPshcKIPlx0PMBRcryJ6vK5zpdBi8avcOxcDw857DDPGeThLabtRsIjkqHleOiYm pUXTrmsnbm1LLx657qS97UNZboi7EBuBUE0533HZMY0YfLB1qrenwE8kM3kHFS3PG0hI13 JA83NjIrCv8XpKY/fkqrp7XULOUaWaYRouRlVgAYji4dzY/yg4qHzoGdH14b+4iVzgqp0/ wxhNL+0kzI0Er6FoGuANlP4l+vUeilVq5yWK+iHbKBCvirvcUFVlBpJQLHURSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652204184; a=rsa-sha256; cv=none; b=A435buq7nUQsOIg9nqf/WwrLob9iyy2v0F8vw8Eh6DN/fXVIbVoEzQLoc7rqTc3x4gGzRU jHXyg4i5tjvJiunEmvFxu31g1Av7w5MOIE5YZHcJ48dB5UhNcvdCPO05oiIrWXfelumc3Y CY0kcjs7VVsRBHnJTvNxhG7uKdTzw7F6O2WkPycqohgijNzOmD/r33IBwNL1kA0Eg5+C6O xu8wSBE9AEpGX+YdeOhcoeZDDAqSbR7hK2jcRBWaoVt1Fw3+lZywDyziw9tjb1Fs/RhzFb STqBhluhpFm5Ohi/BI+QVTRGQr9TNRN0c47+Ck3lO3bSKPwKfCsAi2SoWQ5JlA== 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=992ae60ba4990c3f963052a8e77b8caffbdcf354 commit 992ae60ba4990c3f963052a8e77b8caffbdcf354 Author: John Baldwin AuthorDate: 2022-05-10 17:21:38 +0000 Commit: John Baldwin CommitDate: 2022-05-10 17:21:38 +0000 powerpc powermac: Remove unused devclass arguments to DRIVER_MODULE. --- sys/powerpc/powermac/atibl.c | 4 +--- sys/powerpc/powermac/cpcht.c | 4 +--- sys/powerpc/powermac/cuda.c | 4 +--- sys/powerpc/powermac/fcu.c | 4 +--- sys/powerpc/powermac/grackle.c | 6 ++---- sys/powerpc/powermac/hrowpic.c | 4 +--- sys/powerpc/powermac/kiic.c | 5 ++--- sys/powerpc/powermac/macgpio.c | 5 +---- sys/powerpc/powermac/macio.c | 5 +---- sys/powerpc/powermac/nvbl.c | 4 +--- sys/powerpc/powermac/pmu.c | 11 +++-------- sys/powerpc/powermac/pswitch.c | 5 +---- sys/powerpc/powermac/smu.c | 13 ++++--------- sys/powerpc/powermac/smusat.c | 4 +--- sys/powerpc/powermac/tbgpio.c | 5 +---- sys/powerpc/powermac/uninorth.c | 5 +---- sys/powerpc/powermac/uninorthpci.c | 5 +---- sys/powerpc/powermac/vcoregpio.c | 4 +--- 18 files changed, 25 insertions(+), 72 deletions(-) diff --git a/sys/powerpc/powermac/atibl.c b/sys/powerpc/powermac/atibl.c index ad78ff743436..89d339f871bf 100644 --- a/sys/powerpc/powermac/atibl.c +++ b/sys/powerpc/powermac/atibl.c @@ -101,9 +101,7 @@ static driver_t atibl_driver = { sizeof(struct atibl_softc) }; -static devclass_t atibl_devclass; - -DRIVER_MODULE(atibl, vgapci, atibl_driver, atibl_devclass, 0, 0); +DRIVER_MODULE(atibl, vgapci, atibl_driver, 0, 0); static void atibl_identify(driver_t *driver, device_t parent) diff --git a/sys/powerpc/powermac/cpcht.c b/sys/powerpc/powermac/cpcht.c index c4b658f2347a..e03f02477c16 100644 --- a/sys/powerpc/powermac/cpcht.c +++ b/sys/powerpc/powermac/cpcht.c @@ -138,11 +138,9 @@ struct cpcht_softc { struct mtx htirq_mtx; }; -static devclass_t cpcht_devclass; DEFINE_CLASS_1(pcib, cpcht_driver, cpcht_methods, sizeof(struct cpcht_softc), ofw_pcib_driver); -EARLY_DRIVER_MODULE(cpcht, ofwbus, cpcht_driver, cpcht_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(cpcht, ofwbus, cpcht_driver, 0, 0, BUS_PASS_BUS); #define CPCHT_IOPORT_BASE 0xf4000000UL /* Hardwired */ #define CPCHT_IOPORT_SIZE 0x00400000UL diff --git a/sys/powerpc/powermac/cuda.c b/sys/powerpc/powermac/cuda.c index 0feb197143f3..43888bc02b34 100644 --- a/sys/powerpc/powermac/cuda.c +++ b/sys/powerpc/powermac/cuda.c @@ -113,9 +113,7 @@ static driver_t cuda_driver = { sizeof(struct cuda_softc), }; -static devclass_t cuda_devclass; - -DRIVER_MODULE(cuda, macio, cuda_driver, cuda_devclass, 0, 0); +DRIVER_MODULE(cuda, macio, cuda_driver, 0, 0); DRIVER_MODULE(adb, cuda, adb_driver, 0, 0); static void cuda_intr(void *arg); diff --git a/sys/powerpc/powermac/fcu.c b/sys/powerpc/powermac/fcu.c index b354e975f4d4..a129fe7dfae4 100644 --- a/sys/powerpc/powermac/fcu.c +++ b/sys/powerpc/powermac/fcu.c @@ -130,9 +130,7 @@ static driver_t fcu_driver = { sizeof(struct fcu_softc) }; -static devclass_t fcu_devclass; - -DRIVER_MODULE(fcu, iicbus, fcu_driver, fcu_devclass, 0, 0); +DRIVER_MODULE(fcu, iicbus, fcu_driver, 0, 0); static MALLOC_DEFINE(M_FCU, "fcu", "FCU Sensor Information"); static int diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index 06b5992e99a0..dc97d250f1ea 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -98,10 +98,9 @@ static device_method_t grackle_methods[] = { DEVMETHOD_END }; -static devclass_t grackle_devclass; DEFINE_CLASS_1(pcib, grackle_driver, grackle_methods, sizeof(struct grackle_softc), ofw_pcib_driver); -DRIVER_MODULE(grackle, ofwbus, grackle_driver, grackle_devclass, 0, 0); +DRIVER_MODULE(grackle, ofwbus, grackle_driver, 0, 0); static int grackle_probe(device_t dev) @@ -317,6 +316,5 @@ static driver_t grackle_hb_driver = { grackle_hb_methods, 1, }; -static devclass_t grackle_hb_devclass; -DRIVER_MODULE(grackle_hb, pci, grackle_hb_driver, grackle_hb_devclass, 0, 0); +DRIVER_MODULE(grackle_hb, pci, grackle_hb_driver, 0, 0); diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c index 6206304a59b8..53a2837e1e57 100644 --- a/sys/powerpc/powermac/hrowpic.c +++ b/sys/powerpc/powermac/hrowpic.c @@ -94,9 +94,7 @@ static driver_t hrowpic_driver = { sizeof(struct hrowpic_softc) }; -static devclass_t hrowpic_devclass; - -DRIVER_MODULE(hrowpic, macio, hrowpic_driver, hrowpic_devclass, 0, 0); +DRIVER_MODULE(hrowpic, macio, hrowpic_driver, 0, 0); static uint32_t hrowpic_read_reg(struct hrowpic_softc *sc, u_int reg, u_int bank) diff --git a/sys/powerpc/powermac/kiic.c b/sys/powerpc/powermac/kiic.c index b08444763724..46981e5ecc29 100644 --- a/sys/powerpc/powermac/kiic.c +++ b/sys/powerpc/powermac/kiic.c @@ -145,10 +145,9 @@ static driver_t kiic_driver = { kiic_methods, sizeof(struct kiic_softc) }; -static devclass_t kiic_devclass; -DRIVER_MODULE(kiic, macio, kiic_driver, kiic_devclass, 0, 0); -DRIVER_MODULE(kiic, unin, kiic_driver, kiic_devclass, 0, 0); +DRIVER_MODULE(kiic, macio, kiic_driver, 0, 0); +DRIVER_MODULE(kiic, unin, kiic_driver, 0, 0); static int kiic_probe(device_t self) diff --git a/sys/powerpc/powermac/macgpio.c b/sys/powerpc/powermac/macgpio.c index a82888435163..2b0aa7f42f93 100644 --- a/sys/powerpc/powermac/macgpio.c +++ b/sys/powerpc/powermac/macgpio.c @@ -122,10 +122,7 @@ static driver_t macgpio_pci_driver = { sizeof(struct macgpio_softc) }; -devclass_t macgpio_devclass; - -EARLY_DRIVER_MODULE(macgpio, macio, macgpio_pci_driver, macgpio_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(macgpio, macio, macgpio_pci_driver, 0, 0, BUS_PASS_BUS); struct macgpio_devinfo { struct ofw_bus_devinfo mdi_obdinfo; diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 3e5007973726..23b72edf6e0d 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -139,10 +139,7 @@ static driver_t macio_pci_driver = { sizeof(struct macio_softc) }; -devclass_t macio_devclass; - -EARLY_DRIVER_MODULE(macio, pci, macio_pci_driver, macio_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(macio, pci, macio_pci_driver, 0, 0, BUS_PASS_BUS); /* * PCI ID search table diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c index ba1f84badf94..aa13115b7cf2 100644 --- a/sys/powerpc/powermac/nvbl.c +++ b/sys/powerpc/powermac/nvbl.c @@ -79,9 +79,7 @@ static driver_t nvbl_driver = { sizeof(struct nvbl_softc) }; -static devclass_t nvbl_devclass; - -DRIVER_MODULE(nvbl, vgapci, nvbl_driver, nvbl_devclass, 0, 0); +DRIVER_MODULE(nvbl, vgapci, nvbl_driver, 0, 0); static void nvbl_identify(driver_t *driver, device_t parent) diff --git a/sys/powerpc/powermac/pmu.c b/sys/powerpc/powermac/pmu.c index 56194d85e7bb..984547f97b7b 100644 --- a/sys/powerpc/powermac/pmu.c +++ b/sys/powerpc/powermac/pmu.c @@ -154,10 +154,7 @@ static driver_t pmu_driver = { sizeof(struct pmu_softc), }; -static devclass_t pmu_devclass; - -EARLY_DRIVER_MODULE(pmu, macio, pmu_driver, pmu_devclass, 0, 0, - BUS_PASS_RESOURCE); +EARLY_DRIVER_MODULE(pmu, macio, pmu_driver, 0, 0, BUS_PASS_RESOURCE); DRIVER_MODULE(adb, pmu, adb_driver, 0, 0); static int pmuextint_probe(device_t); @@ -176,10 +173,8 @@ static driver_t pmuextint_driver = { 0 }; -static devclass_t pmuextint_devclass; - -EARLY_DRIVER_MODULE(pmuextint, macgpio, pmuextint_driver, pmuextint_devclass, - 0, 0, BUS_PASS_RESOURCE); +EARLY_DRIVER_MODULE(pmuextint, macgpio, pmuextint_driver, 0, 0, + BUS_PASS_RESOURCE); /* Make sure uhid is loaded, as it turns off some of the ADB emulation */ MODULE_DEPEND(pmu, usb, 1, 1, 1); diff --git a/sys/powerpc/powermac/pswitch.c b/sys/powerpc/powermac/pswitch.c index e2da0f534188..a4712e67930c 100644 --- a/sys/powerpc/powermac/pswitch.c +++ b/sys/powerpc/powermac/pswitch.c @@ -70,10 +70,7 @@ static driver_t pswitch_driver = { sizeof(struct pswitch_softc) }; -static devclass_t pswitch_devclass; - -EARLY_DRIVER_MODULE(pswitch, macgpio, pswitch_driver, pswitch_devclass, - 0, 0, BUS_PASS_RESOURCE); +EARLY_DRIVER_MODULE(pswitch, macgpio, pswitch_driver, 0, 0, BUS_PASS_RESOURCE); static int pswitch_probe(device_t dev) diff --git a/sys/powerpc/powermac/smu.c b/sys/powerpc/powermac/smu.c index 2981b89c59f2..b6c17783be61 100644 --- a/sys/powerpc/powermac/smu.c +++ b/sys/powerpc/powermac/smu.c @@ -213,9 +213,7 @@ static driver_t smu_driver = { sizeof(struct smu_softc) }; -static devclass_t smu_devclass; - -DRIVER_MODULE(smu, ofwbus, smu_driver, smu_devclass, 0, 0); +DRIVER_MODULE(smu, ofwbus, smu_driver, 0, 0); static MALLOC_DEFINE(M_SMU, "smu", "SMU Sensor Information"); #define SMU_MAILBOX 0x8000860c @@ -631,10 +629,8 @@ static driver_t doorbell_driver = { 0 }; -static devclass_t doorbell_devclass; - -EARLY_DRIVER_MODULE(smudoorbell, macgpio, doorbell_driver, doorbell_devclass, - 0, 0, BUS_PASS_SUPPORTDEV); +EARLY_DRIVER_MODULE(smudoorbell, macgpio, doorbell_driver, 0, 0, + BUS_PASS_SUPPORTDEV); static int doorbell_probe(device_t dev) @@ -1415,9 +1411,8 @@ static driver_t smuiic_driver = { smuiic_methods, sizeof(struct smuiic_softc) }; -static devclass_t smuiic_devclass; -DRIVER_MODULE(smuiic, smu, smuiic_driver, smuiic_devclass, 0, 0); +DRIVER_MODULE(smuiic, smu, smuiic_driver, 0, 0); static void smu_attach_i2c(device_t smu, phandle_t i2croot) diff --git a/sys/powerpc/powermac/smusat.c b/sys/powerpc/powermac/smusat.c index a7df8b9227c8..bde472422fe5 100644 --- a/sys/powerpc/powermac/smusat.c +++ b/sys/powerpc/powermac/smusat.c @@ -88,9 +88,7 @@ static driver_t smusat_driver = { sizeof(struct smusat_softc) }; -static devclass_t smusat_devclass; - -DRIVER_MODULE(smusat, iicbus, smusat_driver, smusat_devclass, 0, 0); +DRIVER_MODULE(smusat, iicbus, smusat_driver, 0, 0); static int smusat_probe(device_t dev) diff --git a/sys/powerpc/powermac/tbgpio.c b/sys/powerpc/powermac/tbgpio.c index 348a8d26b688..358a8f1c3352 100644 --- a/sys/powerpc/powermac/tbgpio.c +++ b/sys/powerpc/powermac/tbgpio.c @@ -61,10 +61,7 @@ static driver_t tbgpio_driver = { sizeof(struct tbgpio_softc) }; -static devclass_t tbgpio_devclass; - -EARLY_DRIVER_MODULE(tbgpio, macgpio, tbgpio_driver, tbgpio_devclass, 0, 0, - BUS_PASS_CPU); +EARLY_DRIVER_MODULE(tbgpio, macgpio, tbgpio_driver, 0, 0, BUS_PASS_CPU); static int tbgpio_probe(device_t dev) diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index 64371162a05f..832861ecf03d 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -135,8 +135,6 @@ static driver_t unin_chip_driver = { sizeof(struct unin_chip_softc) }; -static devclass_t unin_chip_devclass; - /* * Assume there is only one unin chip in a PowerMac, so that pmu.c functions can * suspend the chip after the whole rest of the device tree is suspended, not @@ -144,8 +142,7 @@ static devclass_t unin_chip_devclass; */ static device_t unin_chip; -EARLY_DRIVER_MODULE(unin, ofwbus, unin_chip_driver, unin_chip_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(unin, ofwbus, unin_chip_driver, 0, 0, BUS_PASS_BUS); /* * Add an interrupt to the dev's resource list if present diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c index 508bcd29df0e..77e32981a64b 100644 --- a/sys/powerpc/powermac/uninorthpci.c +++ b/sys/powerpc/powermac/uninorthpci.c @@ -97,12 +97,9 @@ static device_method_t uninorth_methods[] = { DEVMETHOD_END }; -static devclass_t uninorth_devclass; - DEFINE_CLASS_1(pcib, uninorth_driver, uninorth_methods, sizeof(struct uninorth_softc), ofw_pcib_driver); -EARLY_DRIVER_MODULE(uninorth, ofwbus, uninorth_driver, uninorth_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(uninorth, ofwbus, uninorth_driver, 0, 0, BUS_PASS_BUS); static int uninorth_probe(device_t dev) diff --git a/sys/powerpc/powermac/vcoregpio.c b/sys/powerpc/powermac/vcoregpio.c index f2037f7b5039..37b534fe74bb 100644 --- a/sys/powerpc/powermac/vcoregpio.c +++ b/sys/powerpc/powermac/vcoregpio.c @@ -63,9 +63,7 @@ static driver_t vcoregpio_driver = { 0 }; -static devclass_t vcoregpio_devclass; - -DRIVER_MODULE(vcoregpio, macgpio, vcoregpio_driver, vcoregpio_devclass, 0, 0); +DRIVER_MODULE(vcoregpio, macgpio, vcoregpio_driver, 0, 0); static int vcoregpio_probe(device_t dev)