From nobody Fri May 06 22:42:48 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 3848D1AB7D88; Fri, 6 May 2022 22:42:49 +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 4Kw5Dm6dBjz3v21; Fri, 6 May 2022 22:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876969; 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=anM86I2p86Ye1loljIUg94OkV67FUVKNbojAdlViFHg=; b=Yz0AuHCdvSQWuT0Z/8J67tnjVMhGaFj06Raho/gYKJAutXGbUIa8lVhBcOozQIpKYb3mms 1yLzAYOUhxadW3hRs+F+M9513ecz+ahpM3mVYwokq6FGs0oC411XSLc1DeTW9sZTWorwGf EGbBnwLXeY3YSzf6dWAbQKK9GDrONlkSsDPpht1cPijoV08wCTPL6NjTGPdaSt3o1bi43B aKNjb6h1BjO0VIIWuPOvAAlJz13QcE4HB6BGkgl2QFjtPomeIRgi33kwHKVHQTfFHkGb3p rA42doSuuE0fQzdnmIUWdcrjL6H1LWL6lBfz3gk5ZG56tYhBwzWYSGh4WnJRxA== 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 A62B224B02; Fri, 6 May 2022 22:42:48 +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 246MgmeY018855; Fri, 6 May 2022 22:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 246Mgm76018854; Fri, 6 May 2022 22:42:48 GMT (envelope-from git) Date: Fri, 6 May 2022 22:42:48 GMT Message-Id: <202205062242.246Mgm76018854@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: 43ac2b6d7c54 - main - Remove isab_devclass from ISA bridge drivers. 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: 43ac2b6d7c5459debd6c1e5dc2fa3334fc645809 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651876969; 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=anM86I2p86Ye1loljIUg94OkV67FUVKNbojAdlViFHg=; b=FsnV9FkYXJhZh+fEZYHyYpI8hb4bFlqBmKljucwV94IiFBl3kqqo52oCdGMl+jdrjUCa0N FQCGqacp92XcSmO5BQXpAmeM1+AETYgLgaPpfTweY50W8XnGXkEVuFs0n/GoimQFvvc81s ZAURGhU8i92EeOrdH3AroYTSIlKPvDgntMHzJSkpsjHsmvaapVhILTjYU1bWfH97/nLw5u ey3wTXQhQzesbkV0PaICUFirKIPXsw2fKA+Nl8vwaIscg1sC9caDej1QbtSYhJrzTFdE8n lLYKkW17thMix7O0cq8U5UmgFE1ZqQXAbZ69j8Mk+jObqqGIjolE5U87UqTISQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651876969; a=rsa-sha256; cv=none; b=GxETexj3jQROjnjcrtpVlOAXaWwWpB1dW/h1PwABwWmhtdnnUo9GGD5jEzZKONvMFOJNEj R0Q514MT+6r9dGoPE3tZ5jNAkyA+ulSplwiU7fbBpTbYw7qU5EI+uPfH+42pg8YmbEpcr2 0jwBqvCFXHgK6j/d1lkIPeDEgw3n8sJ1D8Uipohpc7XMlbdRIZKfI3z2fwlFwbEgPZW7wH WxrZnGtIUuQlsGXhcEr5oNkDdGxbzZbaX5CbkIsU/a1G/EgOEPEqzNBvE/Mngj4/YA9Lhq LrPtvdWo4u+nn1zt+ULp46gvwcLrUvwJvyu410mdUdhrtCG8chRcn7z9Ct5Weg== 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=43ac2b6d7c5459debd6c1e5dc2fa3334fc645809 commit 43ac2b6d7c5459debd6c1e5dc2fa3334fc645809 Author: John Baldwin AuthorDate: 2022-04-19 18:56:41 +0000 Commit: John Baldwin CommitDate: 2022-05-06 22:39:28 +0000 Remove isab_devclass from ISA bridge drivers. --- sys/dev/acpica/acpi_isab.c | 2 +- sys/dev/pci/isa_pci.c | 2 +- sys/isa/isa_common.c | 2 -- sys/isa/isavar.h | 3 --- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index 8e305f423b20..144a9e523a94 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -84,7 +84,7 @@ static driver_t acpi_isab_driver = { sizeof(struct acpi_isab_softc), }; -DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0); +DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, 0, 0); MODULE_DEPEND(acpi_isab, acpi, 1, 1, 1); static int diff --git a/sys/dev/pci/isa_pci.c b/sys/dev/pci/isa_pci.c index 3c3b353806c4..9f2c33bdfac8 100644 --- a/sys/dev/pci/isa_pci.c +++ b/sys/dev/pci/isa_pci.c @@ -95,7 +95,7 @@ static driver_t isab_driver = { sizeof(struct isab_pci_softc), }; -DRIVER_MODULE(isab, pci, isab_driver, isab_devclass, 0, 0); +DRIVER_MODULE(isab, pci, isab_driver, 0, 0); /* * XXX we need to add a quirk list here for bridges that don't correctly diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 3255e76308c0..1fd3aa998ee4 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -1113,8 +1113,6 @@ MODULE_VERSION(isa, 1); * Code common to ISA bridges. */ -devclass_t isab_devclass; - int isab_attach(device_t dev) { diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index c4ac81297e29..b86e64f308d9 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -165,9 +165,6 @@ ISA_ACCESSOR(pnp_csn, PNP_CSN, int) ISA_ACCESSOR(pnp_ldn, PNP_LDN, int) ISA_ACCESSOR(pnpbios_handle, PNPBIOS_HANDLE, int) -/* Device class for ISA bridges. */ -extern devclass_t isab_devclass; - extern void isa_probe_children(device_t dev); void isa_dmacascade(int chan);