From patchwork Mon Oct 23 05:35:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DC667C001E0 for ; Mon, 23 Oct 2023 05:37:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8t8tm+RRdKsWhK9ZIdisPskmS+YV0Db0TpX9E84QtrM=; b=2CqWo0KVeeK0es BNI5X1W52PL/8wow2JOj42WyXdgHapJBIADgRQ/wQzjL2J/Z5dq8DL8hLsOM5dZi512Cw8361RkLt baNCJ/CEeTmMR5J8W/TY4/TbJt6jIdiO+oyQXwsMSlHz+/uU+TI+3emJgbS1QYHeGUkBnUp/sN8CL aBJb/zTs5AjwebB1x2VS41C6IM7jcCK6DQO0ewJ0WGiBjeSZ86z42UjZN8cdR+ILruaNn4HRbWtIE 8PQQ+RQNXUrhQUopITtC70ttkTYY6fMIdXp/lGY7UL4H4svYd7d7n0YTR8BaYAVJlInb3ci3n0YMa VLQfq0zBslVqABk3niXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qunc8-006TT7-0K; Mon, 23 Oct 2023 05:36:32 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc4-006TR7-2Q for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:30 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039388; x=1729575388; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=8Pmv3DZWM/2dbRrEDbbreAnJn6Hwwne5SAiYAHhbnP4=; b=lJlqxRdp9wAtJ6sxmHshNtKClnpXLyFTmXc7xVkesk/hZBm7YGu5FbnV uKK/TCtKkrsBoj+LJiZrHJ0IGxZeCHpCGiJl6aazaW6fk2LK1UoWHeQpk RxaYRmWM3z5egtbOsm1uoL/4KctjxeGr9gpzyo6I87EIsRlaKfWBLVkA4 afv02od35/RwpF1iqHRi5R3NHUy2sMcFnjsM5C0vuSTZu0alupassqTXP QY9Cit3aiZbeOnb8Sy0CRkgCbAjWafIEGnVzDoPpA3iOxjGxA60krdtjA HrV/szMj7Tz3EWmiR9fPVgklX98ZaaO5I5JM+LvGnEN/SS4rR+jz2XocZ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905365" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905365" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556678" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556678" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:35:59 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 1/6] ACPI: utils: Introduce acpi_dev_uid_match() for matching _UID Date: Mon, 23 Oct 2023 11:05:25 +0530 Message-Id: <20231023053530.5525-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223628_797733_7E97BD6B X-CRM114-Status: GOOD ( 12.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce acpi_dev_uid_match() helper that matches the device with supplied _UID string. Suggested-by: Andy Shevchenko Signed-off-by: Raag Jadav --- drivers/acpi/utils.c | 31 +++++++++++++++++++++++++++---- include/acpi/acpi_bus.h | 1 + include/linux/acpi.h | 5 +++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 79915d4a0031..be21b77059af 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -824,20 +824,43 @@ bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64 funcs) } EXPORT_SYMBOL(acpi_check_dsm); +/** + * acpi_dev_uid_match - Match device by supplied UID + * @adev: ACPI device to match. + * @uid2: Unique ID of the device. + * + * Matches UID in @adev with given @uid2. + * + * Returns: + * - %true if matches. + * - %false otherwise. + */ +bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) +{ + const char *uid1 = acpi_device_uid(adev); + + return uid1 && uid2 && !strcmp(uid1, uid2); +} +EXPORT_SYMBOL_GPL(acpi_dev_uid_match); + /** * acpi_dev_hid_uid_match - Match device by supplied HID and UID * @adev: ACPI device to match. * @hid2: Hardware ID of the device. * @uid2: Unique ID of the device, pass NULL to not check _UID. * - * Matches HID and UID in @adev with given @hid2 and @uid2. - * Returns true if matches. + * Matches HID and UID in @adev with given @hid2 and @uid2. Absence of @uid2 + * will be treated as a match. If user wants to validate @uid2, it should be + * done before calling this function. + * + * Returns: + * - %true if matches or @uid2 is NULL. + * - %false otherwise. */ bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2) { const char *hid1 = acpi_device_hid(adev); - const char *uid1 = acpi_device_uid(adev); if (strcmp(hid1, hid2)) return false; @@ -845,7 +868,7 @@ bool acpi_dev_hid_uid_match(struct acpi_device *adev, if (!uid2) return true; - return uid1 && !strcmp(uid1, uid2); + return acpi_dev_uid_match(adev, uid2); } EXPORT_SYMBOL(acpi_dev_hid_uid_match); diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 756b3f3c2c45..afeed6e72049 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -763,6 +763,7 @@ static inline bool acpi_device_can_poweroff(struct acpi_device *adev) adev->power.states[ACPI_STATE_D3_HOT].flags.explicit_set); } +bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2); bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2); int acpi_dev_uid_to_integer(struct acpi_device *adev, u64 *integer); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index afd94c9b8b8a..db3a33e19c97 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -787,6 +787,11 @@ static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv) struct acpi_device; +static inline bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) +{ + return false; +} + static inline bool acpi_dev_hid_uid_match(struct acpi_device *adev, const char *hid2, const char *uid2) { From patchwork Mon Oct 23 05:35:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432396 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B227ACDB474 for ; Mon, 23 Oct 2023 05:37:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YUjkm7g92r7OSkIKpt7QWRa7Pg4FJh0Qf0fzuZ8Cfyk=; b=DFleApRFIumjHe VclAwXfsEwPdUhykhgswRj6qWHRsBknphcKnVHxgeBbbze/+tdWCCozSLMKxKSS5yoJBYpLUZiKQk MwfK50adkN3GrxTS0trA0+D5ygZ7bKgbanpm+R3O1Km3/mkHFqKlXTv7P+Qy9K+0k35xFo3TtOsR3 mZV7EXmoD3OoKnSDIWa+tZeJ50Veu9AeKnZvSPHawsTlReucZzME97qfwEROqlTGp5BpiT9Z+ayGW vqzOMonjD5N8DEqYc91qCyu0xh2a8tGnd53zieFRRoCHcyc9BP8PdMXdAd5KQcstWGaNwJbPlDALO LS9h4zwpc2xbDhaWrw+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quncL-006TWU-24; Mon, 23 Oct 2023 05:36:45 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc5-006TR6-3D for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039389; x=1729575389; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=kUk0ItiaVjzsfP94oC1IH39uZvUKoEr3WDbUZtzQLOo=; b=LMU6FuEFaiuF8YhQbJYbUIBAHXbLa45GvsfLDCypbOjEESfRefLjO5KB L1kTDVdo5PY2v5hNnnkBrxe5CQSkaUY9WQ9QmCgm63B97X9iLK1Sw4KTu Hf7JVgobBhScpgDusNROS/Z6EwAssM+WnukKnKBcOz2Gj1l87xXLwyuui 2eLApC/7aNpB6L9zRl/iNwckYOBj/QkoWzecmzxlXaURV8x4M1rCbmOkB u5zYgGyqYrjiYSWJqqDJLSrY7SAK18x/V7M1wJRoXZCYnLfOFKuBn9fOO 3jvC+Q0CluM95lFhq6nIGpUGeG/eWU11OjH8ulK16gvZvisgTnGMgIG9P Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905390" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905390" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556683" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556683" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:36:04 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 2/6] pinctrl: intel: use acpi_dev_uid_match() for matching _UID Date: Mon, 23 Oct 2023 11:05:26 +0530 Message-Id: <20231023053530.5525-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223630_041408_5FAD822F X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert manual _UID references to use the standard ACPI helper. Signed-off-by: Raag Jadav Reviewed-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 3be04ab760d3..999f453344d2 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -1694,7 +1694,7 @@ const struct intel_pinctrl_soc_data *intel_pinctrl_get_soc_data(struct platform_ unsigned int i; for (i = 0; table[i]; i++) { - if (!strcmp(adev->pnp.unique_id, table[i]->uid)) { + if (acpi_dev_uid_match(adev, table[i]->uid)) { data = table[i]; break; } From patchwork Mon Oct 23 05:35:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432398 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F9BCC25B42 for ; Mon, 23 Oct 2023 05:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CMbGM5Nat0Q8fdgMP7PBdl1kNSRsokRXWAgZ8Vny2Wg=; b=Mrqcu79fE6iB66 MjoIdhbpFe77LUN7q9bEj98eX9Mfc+KMSqDD9WdWvRO+ClI4Z1t1stIaMVAJthr9kczQDhlxQuSa5 vaYz6tGTVzJLsucCXSIW/AGdQ4E7vY6y/c/ONIZ/p3CCojEj8aEyXQfzcICUAI+XBmWBrrBwisRy6 gBsephRdvBMzMD4pxblaTtq8qE9NQr4rXPc0otBz+z1HrJZeQgwjjocBjCMJCwhoFpgkwBuveJPCi hTp3ao9alJj1Z+cGsz63ARiKDZmJP3LJy5v6Vl0VmaY6jK5eYQFheFw6YoYDT2rg16KaLXzr2H1+H dep04kcgQq3qWlG19YXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quncM-006TXJ-0k; Mon, 23 Oct 2023 05:36:46 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc6-006TRh-0H for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039390; x=1729575390; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ozdZnaBJZ2vqKdOuWyOWr4NX6JLrJWxExqsMlsM/PrM=; b=l2mjPNbF7KMoklzjgGcIcBtSNHU7CE/kAwXSfIXh3x9u05GuQgVpK/7W kPoR89MWPbV1CEOE0dTVrrSrj+NLI4i7vqMztFEU10ihyPNYTEL8/rA5n 1rFzQmV9C1AT5ycqMJd09l3rILUFnPUGvjTNmOJM7iODew2lyW4hyb1+o t8fEQwlqBLJTTHn/vSgrClA+hQGnG7xHUUvnioxXVbx3BO8zR81I62Wv0 JV9uSDXMf2JbfYh/DxRYB+QfTtLEtxi8JQktX+1YnSr4HtBVnyhS7m33+ idQh/eEuSdk27N/35J0U06k/c9oeXqO3DmERFJqVsKM6koMh7jHhZmYvG A==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905413" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905413" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556687" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556687" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:36:09 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 3/6] ACPI: utils: use acpi_dev_uid_match() for matching _UID Date: Mon, 23 Oct 2023 11:05:27 +0530 Message-Id: <20231023053530.5525-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223630_143113_653094B9 X-CRM114-Status: GOOD ( 11.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert manual _UID references to use the standard ACPI helper. Signed-off-by: Raag Jadav --- drivers/acpi/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index be21b77059af..28c75242fca9 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -942,8 +942,7 @@ static int acpi_dev_match_cb(struct device *dev, const void *data) if (acpi_match_device_ids(adev, match->hid)) return 0; - if (match->uid && (!adev->pnp.unique_id || - strcmp(adev->pnp.unique_id, match->uid))) + if (match->uid && !acpi_dev_uid_match(adev, match->uid)) return 0; if (match->hrv == -1) From patchwork Mon Oct 23 05:35:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432395 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 80C28C001E0 for ; Mon, 23 Oct 2023 05:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=thgutUFAIKXhcpdMwCrAM93GnMawbeftEOp9t3FpWj0=; b=o7HOs2P9104Ml3 PhUT2jLunGfbxuLsnXfTR5JOCNC5lyZ7TPXXIzG8DAVOAhxH08vv4BFJmCzge8pA0ilHSEI5AtJXm ecJlD5mlNQUVN/o3ncEFG2wuv7+nzLKACWkPg9s7wHbcoj9SogXpx8k2iDqBijcQbBFM7Jkymi8Gg 8lEVmrb2EoXgtP/8XMvUq9qH46mqhd+eEZkkj1jo5MPmX3xrsrWATkRC8Qpj0EF4EKbHeB+VvCjsN QmFJqtD1CaxvEt/A6FHiC+NPuRX5JP3PsmxcN6DhHRsgFjchhnKGJJfZKOGfq6swliA0y8LqrARSI SdUe5BO3bvHZDm1BzaSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quncM-006TXg-2Y; Mon, 23 Oct 2023 05:36:46 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc6-006TR7-0U for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039390; x=1729575390; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=4ahXNqa6c7vy2x9ujTqdFUKWTVtZ7enEGrd79rmm95E=; b=k3UOdXp+R25wC+/gMD6+yNw7w8Ca9hzqRBluY5RoHXnPJD2+JGjk1/wq W+lIimd9Oaomt+Sq+oF1uYqRDM8o+7OdJhVgqaadh/kC+jcyVX3itmeJg RKeJp80B8+ITR8lnpHkCnzkNh95ahp1pB/KmoobalJsiz1/5P3BpgLE+G acTT+HGXLxQJKJTS4g7BDa6Gdd7+mzi/rpknOqn/YnodvA5ocffqbaWXx VomNpusoVX5WfaUUb/etOsW71lU8VJvvjKui3EGmSwPpdANm7J0qtPj8c 3nJ5760K2xVsDOPWDhw9+y/t0R4WrHiLqBjcRqzdTomYALaAFmjSKzveB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905431" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905431" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556690" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556690" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:36:14 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 4/6] ACPI: x86: use acpi_dev_uid_match() for matching _UID Date: Mon, 23 Oct 2023 11:05:28 +0530 Message-Id: <20231023053530.5525-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223630_210236_E32611AC X-CRM114-Status: GOOD ( 10.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert manual _UID references to use the standard ACPI helper. Signed-off-by: Raag Jadav Reviewed-by: Andy Shevchenko --- drivers/acpi/x86/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index 63d834dd3811..bc65ebfcdf76 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -184,8 +184,7 @@ bool acpi_device_override_status(struct acpi_device *adev, unsigned long long *s if (acpi_match_device_ids(adev, override_status_ids[i].hid)) continue; - if (!adev->pnp.unique_id || - strcmp(adev->pnp.unique_id, override_status_ids[i].uid)) + if (!acpi_dev_uid_match(adev, override_status_ids[i].uid)) continue; } From patchwork Mon Oct 23 05:35:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432397 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6D5AAC25B41 for ; Mon, 23 Oct 2023 05:37:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=c+2QHkbnZoRs/tH+ftjqplSDYdPccfGbxuT5XiO+quQ=; b=Sa94amF6wmnGyq OSwoOkDPrIYHGfSplfSfMYWCaCZ2IK6o54McRyodR3p6E/X3Vu272yOyuq2q0BxNxTE7K/BQMfJSx eXFM4+7eN4Rfx1+UCTlazYjXILZvE+GkZ2gaAQ+bzXCeO12XHw6EkVwEgrMRn6cyujIXdilGMrtAX hkto0sVCf/VaBXtV6iF6iu+h410Mjo00AVgehmifPIvbUUM1JNoWCDUyRu1Ef1VoAJE/2CCvNcYcr kQo196IAG8s/lwTfsYd1F5q0/dwOiPxqyP/bYzIYI2rW5/exdVDtvKSSivEO/UYFG/62MQtAP5T0P oVs2a0d/LPiqMYwBpQaw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quncO-006TYe-00; Mon, 23 Oct 2023 05:36:48 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc7-006TRh-0y for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039391; x=1729575391; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=iUljf5QPUJwxYR0tI8SM3GVeSDgYpl24Lk1AfcVvgFI=; b=McoNvQ85FuFEilsIK3JCfpnQ32i5NptUX9vEQNoKmRqy1/eQ9iE7tFuh yZ4VqYSHgmw5CGSZGKwHGiARd770MwRQYrWAVs33UwdGpSiVraH5DZMAY sv3hFKJCVrf8VRQSm9kUBAq+rtR4tET34lKlJOPkcNAmuFutiBEVMFUa9 lJiUwJB0DTQfhpCLV1xu5LNdiowWOUymiS0uf7mpOKNHM89uqB3SyG1vw 6LzkRReUEhSSTtAOFLQc9mGnauEOFkIJqFBjri8G/NJTmF9FdRX8Awx9D TFIIlvWS+ungm/eiJTIfUXy8AubS6xy5tncWbNNxpdlNwqj6KdtwrD6d4 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905451" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905451" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556697" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556697" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:36:19 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 5/6] hwmon: nct6775: use acpi_dev_hid_uid_match() for matching _HID and _UID Date: Mon, 23 Oct 2023 11:05:29 +0530 Message-Id: <20231023053530.5525-6-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223631_369287_5515AB8C X-CRM114-Status: GOOD ( 11.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert manual _UID references to use the standard ACPI helper. Signed-off-by: Raag Jadav --- drivers/hwmon/nct6775-platform.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c index 81bf03dad6bb..0adeeab7ee03 100644 --- a/drivers/hwmon/nct6775-platform.c +++ b/drivers/hwmon/nct6775-platform.c @@ -1465,10 +1465,8 @@ static const char * const asus_msi_boards[] = { static int nct6775_asuswmi_device_match(struct device *dev, void *data) { struct acpi_device *adev = to_acpi_device(dev); - const char *uid = acpi_device_uid(adev); - const char *hid = acpi_device_hid(adev); - if (hid && !strcmp(hid, ASUSWMI_DEVICE_HID) && uid && !strcmp(uid, data)) { + if (acpi_dev_hid_uid_match(adev, ASUSWMI_DEVICE_HID, data)) { asus_acpi_dev = adev; return 1; } From patchwork Mon Oct 23 05:35:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 13432399 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 63BBDCDB474 for ; Mon, 23 Oct 2023 05:37:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ILgFi8tcNK+BLTDE8dcgBzIRh2GdUKuGVMLKP6O4glI=; b=BXH/G6iqURF075 QellRBBdxaY/dIthanGfPIIfy3OpDT/BT5RR+FN79Y4y4Q35lVu/DA37em11YMBz8eiDj7PhjblaM elVQQgJyWhiItCE9CWXhk2PgsRlk9zVuJ/cr/N2kycWsSM5CInAPT3Gn1zPhXG5Ep7fBEQj187XQI coqm5CtmLaEBFvcP3oN/56rLLm6CmZzgPAUo6HSWLEYK7df4CcXAEq1arhoIHjwDsNJF/gIr9Z/sF kLKht7TII4t3mGs7c2Y8KBQc1iaGZHElt5+C4toQCvRKf9y2m7+MII2khgwYOA1O6rVOsWREa4Sgr SCgR1C778ukgREVxytqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1quncN-006TY0-1D; Mon, 23 Oct 2023 05:36:47 +0000 Received: from mgamail.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qunc7-006TR6-0w for linux-arm-kernel@lists.infradead.org; Mon, 23 Oct 2023 05:36:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698039391; x=1729575391; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=3yrAjMBirTIUAhTanyYbEMtK/J+a0HZi5Xr6F7vjCTw=; b=G9gERb620Qa/cGJJyrSSvTePU1zz+XsA4TNdJHcwqtOYtE94s9BiW0+h saMjF0NPsG37krKXiR+iPNSmwFR1baJgjcZ3FpuVKgMQ2j5tlAe+D8rZC aU323Skwe+wsIkCr1NEtJ/KbgbCS9VHEO8jOa2lTY9z1jAH8YAXCuUJ2B ItBt1gHgN8m/DvwBGSGlqG6fofG8KJAffkCFLgdRvfdIBgstaX9/lJ2SM J4RSLL11LsyZDxMjUo98mk5wZQkydaT2IUZHUGjHRSCc+rT6xGH13RUYE QJ0ccIe3dfs1evCCfC8J9UbXTM1A6M9FKyJ4C7kB+kRudCiG/j8B4m3se g==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="417905466" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="417905466" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Oct 2023 22:36:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="734556713" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="734556713" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by orsmga006.jf.intel.com with ESMTP; 22 Oct 2023 22:36:24 -0700 From: Raag Jadav To: rafael@kernel.org, len.brown@intel.com, robert.moore@intel.com, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com, mark.rutland@arm.com, will@kernel.org, linux@roeck-us.net, Jonathan.Cameron@Huawei.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, acpica-devel@lists.linuxfoundation.org, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com, Raag Jadav Subject: [PATCH v2 6/6] perf: arm_cspmu: use acpi_dev_hid_uid_match() for matching _HID and _UID Date: Mon, 23 Oct 2023 11:05:30 +0530 Message-Id: <20231023053530.5525-7-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231023053530.5525-1-raag.jadav@intel.com> References: <20231023053530.5525-1-raag.jadav@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231022_223631_346310_36098778 X-CRM114-Status: GOOD ( 11.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Convert manual _UID references to use the standard ACPI helpers. Signed-off-by: Raag Jadav --- drivers/perf/arm_cspmu/arm_cspmu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c index e2b7827c4563..f0e6d14281d6 100644 --- a/drivers/perf/arm_cspmu/arm_cspmu.c +++ b/drivers/perf/arm_cspmu/arm_cspmu.c @@ -1061,7 +1061,7 @@ static int arm_cspmu_request_irq(struct arm_cspmu *cspmu) static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid) { - u32 acpi_uid; + u64 acpi_uid; struct device *cpu_dev; struct acpi_device *acpi_dev; @@ -1071,10 +1071,8 @@ static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid) acpi_dev = ACPI_COMPANION(cpu_dev); while (acpi_dev) { - if (!strcmp(acpi_device_hid(acpi_dev), - ACPI_PROCESSOR_CONTAINER_HID) && - !kstrtouint(acpi_device_uid(acpi_dev), 0, &acpi_uid) && - acpi_uid == container_uid) + if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, NULL) && + !acpi_dev_uid_to_integer(acpi_dev, &acpi_uid) && acpi_uid == container_uid) return 0; acpi_dev = acpi_dev_parent(acpi_dev);