From nobody Fri May 06 23:25:29 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 113FD1AD1945; Fri, 6 May 2022 23:25:30 +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 4Kw6B226sfz3FLw; Fri, 6 May 2022 23:25:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879530; 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=qyU4oK9N1m4WoO8NVaVvs89s3+MxurumcKohqoLHBl8=; b=JNOnyxWjcrLZcNUTp41S+C7ORH1jJWA5ywELds1LtBqc3DvtHrlz2+BOaEGzPDkJWJvOFZ 4n9pje59sfKA8FumUjdzCtx9wo0JfmZxvGV62v2zp3QLY5VsViUxH3LxGChuuwej3lMEhI lwBXelPQarGjzrDPeyWqyQAWYhDNJSv6Fp1PnhsZo1DSR52U9HaMjzK0EiNCp0Lm/2lgur erB4TqDWqLMYCsfZKe8dkv0pTpY4cltdEy3/oG7PJ+ouKmffNHxwnaTn0oUDjyvZzG41yP hxe3NGMOROaJFfsAGFGvZXMbrFc9mYL3QZcLb2dh9evdW2nWuPmuQD5QdaEuDg== 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 80F7D24FF5; Fri, 6 May 2022 23:25:29 +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 246NPT2B075947; Fri, 6 May 2022 23:25:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246NPTR9075946; Fri, 6 May 2022 23:25:29 GMT (envelope-from git) Date: Fri, 6 May 2022 23:25:29 GMT Message-Id: <202205062325.246NPTR9075946@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: badcc74fe956 - main - amd64: 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: badcc74fe95655cda1878c6874d3dbd8a59a6d2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651879530; 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=qyU4oK9N1m4WoO8NVaVvs89s3+MxurumcKohqoLHBl8=; b=VDLv9W05gT3ljTvHI098LKOSlUUBHtqDVi1LL9fsXMZrqfujVoxKYXuEuNmZljE+dETs06 N10SfgqhJBy75CRiSCGDRDf0e14TFwUAQ6QdjYJHyrcvMTGT6W9J/61iOF3nvoM8j/IYtg zV8HW5I1Rck3QaYXWXoRRsfz49rTsvgKpkadrcFX3du308bhdbD1WBtwttqzXSZc1osmBD SKdgBNonW2AFT9BEYan78pr9OoZ1FWTaxykPxLrjjluJOs2rC3qOmUORPJ9qkVR1Km6bD8 8+5v2Dxf1FjwU/X5b8Ao4mDaUhWIgUW/jgiEAK9yGml+6zoPoD+4v5v3BfTzwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651879530; a=rsa-sha256; cv=none; b=GRjhl5jSZTS7aeHDJjS165XnzR6d+hJQ3Co9MVnGg1MTEx0pzk6Q6S6VpMDZ1tb3QN9JJh eDq4aVRiOHOTzjR/QkQxZ9O+3O/Q9vCNIW/BbTD81jvkNMlnZz3dBWAApzDyf2Bn61OWMU NEPcDpoPQB1RySTEINltUnThIV55kfrX8XA586wX0KSZXLdeAAuhmof5MMYQtlKd/oeN7G ldoGYd8xMsJouoN9ni75mq7uzhRgN9mvYCF4HtyWXvVMraN8JAARctw33WrGOtyWhVYq0a wiijqpCgK0vXOJajlrJ4ujZGAGs41k99At/ZIenGb2uIGJLYT9+MfLxyv44HyQ== 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=badcc74fe95655cda1878c6874d3dbd8a59a6d2e commit badcc74fe95655cda1878c6874d3dbd8a59a6d2e Author: John Baldwin AuthorDate: 2022-05-06 22:46:59 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:46:59 +0000 amd64: Remove unused devclass arguments to DRIVER_MODULE. --- sys/amd64/acpica/acpi_machdep.c | 3 +-- sys/amd64/amd64/fpu.c | 4 +--- sys/amd64/vmm/amd/amdiommu.c | 4 +--- sys/amd64/vmm/amd/ivrs_drv.c | 5 +---- sys/amd64/vmm/io/ppt.c | 3 +-- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c index a443c8693aa3..bbeb7cef44c5 100644 --- a/sys/amd64/acpica/acpi_machdep.c +++ b/sys/amd64/acpica/acpi_machdep.c @@ -286,6 +286,5 @@ static device_method_t nexus_acpi_methods[] = { }; DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); -static devclass_t nexus_devclass; -DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); +DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, 0, 0); diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index 0bbf1cf047c0..dedb174dbe47 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -1060,9 +1060,7 @@ static driver_t fpupnp_driver = { 1, /* no softc */ }; -static devclass_t fpupnp_devclass; - -DRIVER_MODULE(fpupnp, acpi, fpupnp_driver, fpupnp_devclass, 0, 0); +DRIVER_MODULE(fpupnp, acpi, fpupnp_driver, 0, 0); ISA_PNP_INFO(fpupnp_ids); #endif /* DEV_ISA */ diff --git a/sys/amd64/vmm/amd/amdiommu.c b/sys/amd64/vmm/amd/amdiommu.c index 8dceb1aa241b..6b4349d1c160 100644 --- a/sys/amd64/vmm/amd/amdiommu.c +++ b/sys/amd64/vmm/amd/amdiommu.c @@ -178,8 +178,6 @@ ivhd_teardown_intr(device_t dev) return (0); } -static devclass_t amdiommu_devclass; - /* This driver has to be loaded before ivhd */ -DRIVER_MODULE(amdiommu, pci, amdiommu_driver, amdiommu_devclass, 0, 0); +DRIVER_MODULE(amdiommu, pci, amdiommu_driver, 0, 0); MODULE_DEPEND(amdiommu, pci, 1, 1, 1); diff --git a/sys/amd64/vmm/amd/ivrs_drv.c b/sys/amd64/vmm/amd/ivrs_drv.c index a0b332e297b1..574c70cad383 100644 --- a/sys/amd64/vmm/amd/ivrs_drv.c +++ b/sys/amd64/vmm/amd/ivrs_drv.c @@ -754,12 +754,9 @@ static driver_t ivhd_driver = { sizeof(struct amdvi_softc), }; -static devclass_t ivhd_devclass; - /* * Load this module at the end after PCI re-probing to configure interrupt. */ -DRIVER_MODULE_ORDERED(ivhd, acpi, ivhd_driver, ivhd_devclass, 0, 0, - SI_ORDER_ANY); +DRIVER_MODULE_ORDERED(ivhd, acpi, ivhd_driver, 0, 0, SI_ORDER_ANY); MODULE_DEPEND(ivhd, acpi, 1, 1, 1); MODULE_DEPEND(ivhd, pci, 1, 1, 1); diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c index a936326e8df3..6bcd8f78bbab 100644 --- a/sys/amd64/vmm/io/ppt.c +++ b/sys/amd64/vmm/io/ppt.c @@ -195,9 +195,8 @@ static device_method_t ppt_methods[] = { {0, 0} }; -static devclass_t ppt_devclass; DEFINE_CLASS_0(ppt, ppt_driver, ppt_methods, sizeof(struct pptdev)); -DRIVER_MODULE(ppt, pci, ppt_driver, ppt_devclass, NULL, NULL); +DRIVER_MODULE(ppt, pci, ppt_driver, NULL, NULL); static int ppt_find(struct vm *vm, int bus, int slot, int func, struct pptdev **pptp)