From nobody Mon May 09 21:47:42 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 F18F41AC9861; Mon, 9 May 2022 21:47:42 +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 4Kxvsp3VP0z3Gcx; Mon, 9 May 2022 21:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132862; 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=khH4etm3yZg8ybuOY6lase/JP53mSGzgVOXtuf7a9gE=; b=WE4pY6K43ZdiPqw4hoTdC1fE4d1CRvjvHYNFDxl4j5jGGR3+qfEMEEgluXElhWbJ6p/78N o3aYy8Sd127ZpU/3T8zRhI/J9sRwoP1TPnhppnf+/nRcqdHEGBEs/3djpMuFwQukIUX/pA M4sbbKfhjMiIdpJsIpedYwm5U4rPzEc4lO6YJkCDKfbChKQ9+i4OP3HHyUIUcK/+zW90GI KRuhXvkLPojeBacNRjQ/HEu1ND3uaq9vkcsB59UrTXgZGk7jZRItdl7T0uss796hPXCHYL vSAhIY7TIsenNfCaEpxPR6xXbzghwTfKD6RELIlGiwGlRJGU0djUNnpNIclBYg== 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 398AC18F06; Mon, 9 May 2022 21:47:42 +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 249Llg2Q080001; Mon, 9 May 2022 21:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249LlgUK080000; Mon, 9 May 2022 21:47:42 GMT (envelope-from git) Date: Mon, 9 May 2022 21:47:42 GMT Message-Id: <202205092147.249LlgUK080000@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: 03f6459cb3c0 - main - ofw drivers: 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: 03f6459cb3c085f0d03419822d60bd7961a97f09 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652132862; 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=khH4etm3yZg8ybuOY6lase/JP53mSGzgVOXtuf7a9gE=; b=k6xsQEUrx35uV64zR4RFs9Us+d0OZPqAl3Y0RCWIwe00+4g/EU+FO0O/h1FR0REdOoa4Tq hLpz/CI2UYAPvg5IyllCw65pRNMC2IMHelIblBQcdcTAms9TKCLFnUDOiJwCjrykoQPQzn Hiq8JCByKloY9JqiMiZfiMPOK9s/X7ASuFgiBN/kX+fWw5oq8cTxzUISKCPKPJxrGOmlG6 4d3zVwWXSZ0SjeWtRR+9ER1SPSq70LQgSep7pI3D2MinYa/n+8Xxy1x7BhYUS5pQDqguwy xlI7KIgCe3+/b/dLVF+IaQwnfKKJDewubG0U04s7rO/FnHe+Mhxw35N3PIF6Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652132862; a=rsa-sha256; cv=none; b=U4d/qkH6h3kbJdJlz7d7PS9RPgaz/88x7eadxAbrZp52hE4GONC6IlvIVxD4UyAYMy/hQD tTiMw7IADwpeik7UHlhMcWgt/6/VBpBqH6b6CZovNgAFM5pct78lDXyCJdS3xd9EKyQEfC Syi5GoWLTe+JSihDPnTpvmVDj+JO0+BaTJeWegts8Yw5yVfotXTAK9qEiA5kzwW2LF2kjo XTx/cYYChufOWtrZQh7J/LHJXU1IUE9I3rpkV396sGoai89MEQiVCe4IL9g+OR6ksm6vZo lz/pLDQ6+E/PlO7Q/6roKo56eyNXN5PhxAkj66x+sahbVuu760Ds5USt6Q9dZg== 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=03f6459cb3c085f0d03419822d60bd7961a97f09 commit 03f6459cb3c085f0d03419822d60bd7961a97f09 Author: John Baldwin AuthorDate: 2022-05-09 21:26:44 +0000 Commit: John Baldwin CommitDate: 2022-05-09 21:26:44 +0000 ofw drivers: Remove unused devclass arguments to DRIVER_MODULE. --- sys/dev/ofw/ofw_cpu.c | 9 ++------- sys/dev/ofw/ofw_pci.c | 4 +--- sys/dev/ofw/ofwbus.c | 3 +-- sys/powerpc/ofw/ofw_pcib_pci.c | 5 +---- sys/powerpc/ofw/ofw_pcibus.c | 5 +---- sys/powerpc/ofw/ofw_syscons.c | 4 +--- 6 files changed, 7 insertions(+), 23 deletions(-) diff --git a/sys/dev/ofw/ofw_cpu.c b/sys/dev/ofw/ofw_cpu.c index c16973373acd..f7bfc10b7b73 100644 --- a/sys/dev/ofw/ofw_cpu.c +++ b/sys/dev/ofw/ofw_cpu.c @@ -86,10 +86,7 @@ static driver_t ofw_cpulist_driver = { sizeof(struct ofw_cpulist_softc) }; -static devclass_t ofw_cpulist_devclass; - -DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, ofw_cpulist_devclass, - 0, 0); +DRIVER_MODULE(ofw_cpulist, ofwbus, ofw_cpulist_driver, 0, 0); static int ofw_cpulist_probe(device_t dev) @@ -183,9 +180,7 @@ static driver_t ofw_cpu_driver = { sizeof(struct ofw_cpu_softc) }; -static devclass_t ofw_cpu_devclass; - -DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, ofw_cpu_devclass, 0, 0); +DRIVER_MODULE(ofw_cpu, cpulist, ofw_cpu_driver, 0, 0); static int ofw_cpu_probe(device_t dev) diff --git a/sys/dev/ofw/ofw_pci.c b/sys/dev/ofw/ofw_pci.c index 4bd6ccd64420..9434bd54f8d9 100644 --- a/sys/dev/ofw/ofw_pci.c +++ b/sys/dev/ofw/ofw_pci.c @@ -63,11 +63,9 @@ static device_method_t ofw_pci_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; - DEFINE_CLASS_1(pci, ofw_pci_driver, ofw_pci_methods, sizeof(struct pci_softc), pci_driver); -DRIVER_MODULE(ofw_pci, pcib, ofw_pci_driver, pci_devclass, 0, 0); +DRIVER_MODULE(ofw_pci, pcib, ofw_pci_driver, 0, 0); MODULE_DEPEND(ofw_pci, simplebus, 1, 1, 1); MODULE_DEPEND(ofw_pci, pci, 1, 1, 1); MODULE_VERSION(ofw_pci, 1); diff --git a/sys/dev/ofw/ofwbus.c b/sys/dev/ofw/ofwbus.c index 2a28a928e15e..a64f03b8099a 100644 --- a/sys/dev/ofw/ofwbus.c +++ b/sys/dev/ofw/ofwbus.c @@ -99,8 +99,7 @@ static device_method_t ofwbus_methods[] = { DEFINE_CLASS_1(ofwbus, ofwbus_driver, ofwbus_methods, sizeof(struct ofwbus_softc), simplebus_driver); -static devclass_t ofwbus_devclass; -EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, ofwbus_devclass, 0, 0, +EARLY_DRIVER_MODULE(ofwbus, nexus, ofwbus_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); MODULE_VERSION(ofwbus, 1); diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c index c39df7f43814..77f83d7d996a 100644 --- a/sys/powerpc/ofw/ofw_pcib_pci.c +++ b/sys/powerpc/ofw/ofw_pcib_pci.c @@ -71,8 +71,6 @@ static device_method_t ofw_pcib_pci_methods[] = { DEVMETHOD_END }; -static devclass_t pcib_devclass; - struct ofw_pcib_softc { /* * This is here so that we can use pci bridge methods, too - the @@ -86,8 +84,7 @@ struct ofw_pcib_softc { DEFINE_CLASS_1(pcib, ofw_pcib_pci_driver, ofw_pcib_pci_methods, sizeof(struct ofw_pcib_softc), pcib_driver); -EARLY_DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, pcib_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_pcib, pci, ofw_pcib_pci_driver, 0, 0, BUS_PASS_BUS); static int ofw_pcib_pci_probe(device_t dev) diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c index cdda3ee779f4..c0e99817888b 100644 --- a/sys/powerpc/ofw/ofw_pcibus.c +++ b/sys/powerpc/ofw/ofw_pcibus.c @@ -100,12 +100,9 @@ static device_method_t ofw_pcibus_methods[] = { DEVMETHOD_END }; -static devclass_t pci_devclass; - DEFINE_CLASS_1(pci, ofw_pcibus_driver, ofw_pcibus_methods, sizeof(struct pci_softc), pci_driver); -EARLY_DRIVER_MODULE(ofw_pcibus, pcib, ofw_pcibus_driver, pci_devclass, 0, 0, - BUS_PASS_BUS); +EARLY_DRIVER_MODULE(ofw_pcibus, pcib, ofw_pcibus_driver, 0, 0, BUS_PASS_BUS); MODULE_VERSION(ofw_pcibus, 1); MODULE_DEPEND(ofw_pcibus, pci, 1, 1, 1); diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c index 633750e1351c..f49230464a36 100644 --- a/sys/powerpc/ofw/ofw_syscons.c +++ b/sys/powerpc/ofw/ofw_syscons.c @@ -1044,9 +1044,7 @@ static driver_t ofwfb_sc_driver = { sizeof(sc_softc_t), }; -static devclass_t sc_devclass; - -DRIVER_MODULE(ofwfb, nexus, ofwfb_sc_driver, sc_devclass, 0, 0); +DRIVER_MODULE(ofwfb, nexus, ofwfb_sc_driver, 0, 0); /* * Utility routines from