From nobody Thu Apr 21 17:30:00 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 34D2D199068B; Thu, 21 Apr 2022 17:30:02 +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 4Kkl0n283Zz4WVf; Thu, 21 Apr 2022 17:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562202; 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=RxGfmoZC/pAzbXbARJJHRlU/Zc0kfWJ2zgRk+gWUL20=; b=nfoqckrGUtE34oJaMzvlR2N6OfHDFOfIrxgLzRk73NsGZFTJT9aY840IQqbhbVMe0Wljs4 tdaS0Uxa56z7cUpP8N5c5TRQHegqJmUVBhi6diHPHcc6CbANqCNDeoD+FO7EDE51QiUESY ltWnEvNtW2goNfZdh4Nm+nkuw1gv4YKUhctZbLDqRe4pVlZmxJNnnfT3peBVKeuJqwn0o5 84iFHM6fWx4pcu2Hh+ZB3z2IuDcGlet+410H9PH2ADjp562EIQednW6wGK2UCSEtQP+nEa ypG0nRStuzLtumHGSRa1Uu6Z/UOkC9/YkwrA+F5jprQ6cSV9t7BAw9cpyjFnJg== 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 1519750F6; Thu, 21 Apr 2022 17:30:01 +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 23LHU0WX000755; Thu, 21 Apr 2022 17:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23LHU0sY000742; Thu, 21 Apr 2022 17:30:00 GMT (envelope-from git) Date: Thu, 21 Apr 2022 17:30:00 GMT Message-Id: <202204211730.23LHU0sY000742@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: 9066471175fe - main - acpi_isab: Check the unit in probe instead of using the devclass. 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: 9066471175fed65bf2d956fdf6bb47f8b8ad3141 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650562202; 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=RxGfmoZC/pAzbXbARJJHRlU/Zc0kfWJ2zgRk+gWUL20=; b=FSBJo7TbE9FdOwhJ9GjPhATcwF3L042iII+vq42LdMpr5d5+b5/6+NLXiAEb4Z8oNDwQeY 9SgJSJnDdRNVUd7lSbEFicR1KmuEcAZqsGpFYhXbygRAtbtvgIWO/T8CzgiZzRM2dx54d6 KHn4SPCgAsha7qo7DRN83CayjLt+cY+/20kXlMVdYthsWEZwF0FbmlLoYYsZ8ePGZrjVoP 6WZgFR6kpcQn1jML0Z4NvCdvml5f6uaafnSENKQ2jeK9+fbPbybVRkfIF+2qDZJaXyQYdL RHfUp3NIjTKMrFsIBXBCDlc0AF7D3els2HwuX5mrW1tVFNxW0Eqjo5fdK7bcbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650562202; a=rsa-sha256; cv=none; b=F9a6eu5AdBRkpdV//MmVFj4OmQE0IAecPB7TI26WxTTYSo1XrdAdysuYI4KA+B/Sjbbzt4 DeSUCUhlWklaA7cXOqW2FKeQKMj4O0AMDc2+TAce2w6da3i/7oyJFVvwSXj+56iNIyJy6D NM2QJhcR2+pybO1hctOqSMgHvukwluZ2FDuj612j5NVQGf8KNj5PR0t4U9WAloklsPMouf ByaOI1M5tXDAB6nnhidy5pqekJ9dbYR89M+eaxZ9chpUChiQvg/4A4crR1DQVuEZBn7gYV U29vfzlt2PEExc6/LcFY1dBX3S0qLSf/U1fPWO+A0QGwjJ0Zed5JJSVwniEAxg== 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=9066471175fed65bf2d956fdf6bb47f8b8ad3141 commit 9066471175fed65bf2d956fdf6bb47f8b8ad3141 Author: John Baldwin AuthorDate: 2022-04-21 17:29:13 +0000 Commit: John Baldwin CommitDate: 2022-04-21 17:29:13 +0000 acpi_isab: Check the unit in probe instead of using the devclass. This is an alternate way to only attach to isab0 for the reasons described in commit 852989bdbf62932455d48342d9d45dfbab4e65dc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D34991 --- sys/dev/acpica/acpi_isab.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c index 2f9bcd258515..8e305f423b20 100644 --- a/sys/dev/acpica/acpi_isab.c +++ b/sys/dev/acpica/acpi_isab.c @@ -93,8 +93,7 @@ acpi_isab_probe(device_t dev) static char *isa_ids[] = { "PNP0A05", "PNP0A06", NULL }; int rv; - if (acpi_disabled("isab") || - devclass_get_device(isab_devclass, 0) != dev) + if (acpi_disabled("isab") || device_get_unit(dev) != 0) return (ENXIO); rv = ACPI_ID_PROBE(device_get_parent(dev), dev, isa_ids, NULL); if (rv <= 0)