Received: by 2002:a05:7412:b130:b0:e2:908c:2ebd with SMTP id az48csp2166834rdb; Mon, 20 Nov 2023 04:09:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IEHuoMJqKt6p08uGaNfIejGUMoyDJSkbkuy5fy9Zr5G4oSSLAHWXQ3cWdIBiOgeXq4iLOoI X-Received: by 2002:a17:90b:1d0b:b0:280:2823:6615 with SMTP id on11-20020a17090b1d0b00b0028028236615mr6659107pjb.36.1700482188760; Mon, 20 Nov 2023 04:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700482188; cv=none; d=google.com; s=arc-20160816; b=RBanqXNk3DOboSVE+RmfeGvHdW7+hHbP9gqDutZ8ahT6y6A3Al4UKCku4W7kyn8ZQZ 2ayAFpMdsRtRPcFEszvMkzVeMUDD3YoToD+mVVr2xm2bDjBww23ZmrOuVZTciOvtJaza CLb2rWgqEf17yC5V5X0b2nidOC7e/IxkIh2yIzfITGR7Kr610DJw9dsFX6wkzGF05UnD TPPJ0gbYJCiEA7KGriSpHR1jhjh3iNntXQwrlS/ZzbEr3kD+zrHXC6dqN1RZy1TL8Zkt t3fFVgEPAodJ+lE8LAIqei9yxsE5q1emVlN1hX1MH6q1L51z297ZOGg0hqYtT5KK8B/m 8gjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=uBYoIdOi/PjZLZumIVGyz365i/BQRkVzkqhHodBS9XY=; fh=LrjGCQr9k+7CYyd6XEdJgJkCFIUW/cPwqK3zW8PbdHI=; b=gvEq9F7zuCNkTWEXa8fkFi2Rbx8XpOqxFns/tWqdvadTYEG4dYeXkgve6yBS3i0Def 1doW/HmjgOw5LBKehkvRnYF//DaZEAcErfkeuXjMMeJG1wXkJlbDf/hDNAD5H9wDnBYH FlOF1/1jJPzfhzzz44+QvajVs40VCll83D+7EJ3ZDMPy6YwqrOisUz1pp+w6NOOyZdOD 4CIKoChlzVsAV0nVsFEeE9R06uLPod+YA8aFsD7sQ8y0bT9EqkBpc8WrKUDy95p/YEQp /mHwbCkd5Mbr1ZpmEPIQMy1ats0MB9JGOhYETN/q7COEDa7+xe4HKJPibmfcxE5LDCfE R6QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=i74tk9rW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id lb3-20020a17090b4a4300b002805aa7b138si10574483pjb.59.2023.11.20.04.09.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 04:09:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=i74tk9rW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 3146B80417FE; Mon, 20 Nov 2023 04:09:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233576AbjKTMJd (ORCPT + 99 others); Mon, 20 Nov 2023 07:09:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233481AbjKTMJX (ORCPT ); Mon, 20 Nov 2023 07:09:23 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E0B9CF; Mon, 20 Nov 2023 04:09:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1700482158; x=1732018158; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=G01FEu7mgWj6wch0a4BuSRZSlujWtyeQmN3DyjCESFk=; b=i74tk9rWI7un0hPI06+gjrAwxTDmVOZfYtqG4kFiIwl5wJLWJJeoNR2z kJXJioL1Dgcu6ZMotG2WxGlVTWqm76rPbL8qK1G3HrrGJYmUg/EEVZbAa +/zYDLhUbZ9cXngfvgTRxpQt5vkiRAqSFgmsW0NLj7VSfwn/88CFNPvIO wGYqvz4ExqOL5IFYRGzXetjaZ3QICeWwQRmDXYLd8BrEYXU5fe8O+k+p/ Q1WBV0nI1AY49i0Z0k2RFpiBA3v2CNg4YpGfKKvc0jHZlSdgp97z4ji6X A9wotPZKfhbH8n18mXs5pSNXQFXFrDCW1d6os7xGWGiJNv7M+RwKHwb90 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="394455773" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="394455773" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Nov 2023 04:09:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10899"; a="769878675" X-IronPort-AV: E=Sophos;i="6.04,213,1695711600"; d="scan'208";a="769878675" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga007.fm.intel.com with ESMTP; 20 Nov 2023 04:09:08 -0800 From: Raag Jadav To: mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, rafael@kernel.org, lenb@kernel.org, robert.moore@intel.com, ardb@kernel.org, will@kernel.org, mark.rutland@arm.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v1 5/6] efi: dev-path-parser: use acpi_dev_uid_match() for matching _UID Date: Mon, 20 Nov 2023 17:38:36 +0530 Message-Id: <20231120120837.3002-6-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231120120837.3002-1-raag.jadav@intel.com> References: <20231120120837.3002-1-raag.jadav@intel.com> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 20 Nov 2023 04:09:46 -0800 (PST) Now that we have _UID matching support for integer types, we can use acpi_dev_uid_match() for it. Signed-off-by: Raag Jadav --- drivers/firmware/efi/dev-path-parser.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c index f80d87c199c3..937be269fee8 100644 --- a/drivers/firmware/efi/dev-path-parser.c +++ b/drivers/firmware/efi/dev-path-parser.c @@ -18,8 +18,6 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, struct acpi_device *adev; struct device *phys_dev; char hid[ACPI_ID_LEN]; - u64 uid; - int ret; if (node->header.length != 12) return -EINVAL; @@ -31,10 +29,9 @@ static long __init parse_acpi_path(const struct efi_dev_path *node, node->acpi.hid >> 16); for_each_acpi_dev_match(adev, hid, NULL, -1) { - ret = acpi_dev_uid_to_integer(adev, &uid); - if (ret == 0 && node->acpi.uid == uid) + if (acpi_dev_uid_match(adev, node->acpi.uid)) break; - if (ret == -ENODATA && node->acpi.uid == 0) + if (!acpi_device_uid(adev) && node->acpi.uid == 0) break; } if (!adev) -- 2.17.1