From patchwork Fri Oct 20 08:47: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: 155883 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913632vqb; Fri, 20 Oct 2023 01:48:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFUwuaw1/ysRDY4Jz4a6w4Xg+YQ2NWRN51hLVupLBTuG7zoYjojP9dq56FctxxlNjjZVBVz X-Received: by 2002:a25:3453:0:b0:d9a:4645:abff with SMTP id b80-20020a253453000000b00d9a4645abffmr1278781yba.62.1697791700590; Fri, 20 Oct 2023 01:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791700; cv=none; d=google.com; s=arc-20160816; b=OKr76486FUjOneDThcheW+0W8j0nfDzeZnMjHNkrvZoSn0aaRmLF0147VxERctxSyW Oi3rVJ72TLjQBpMz/ZRkD9xutB8Rkm+4j5COHfr+fY4jS8gC1nEeCpSunUyKtdbrp8D0 0n7QvydRPv7Fnku4srHRtzPpZ9DJUMiB4jDEHSrVONNPLKQPT4v+6b3WMs23FNUUNTjU jykuGEAIJuVnYGkPfVFz8YCrvuWwLcc0G03/UgGxv5PYX0ArVDFgmWoIPR85QH0eb/jh h5Oyg6dyLRHDNvNyiipiBjft6iXzE43GvVO+Of8TzHiAr+5VDME7vgRjdD/1cKNvfNQi hWhw== 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=xUIa9sHy22Nx7qFTTyLkw7tXgoCFb0BwNq/hqiAi2iw=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=QqwEp0ieASh4PP6uLzzeiP5A/yz2/ldNdvZJWFFw+SKTIAu3aH2hWZR5hNfAilsltD 44PupjBW32t66eAWOhkWnMecU7g+czADIHcPUdrV23mPu6fREjhe7q5eZknFzAcjPtNG imcUK13zkCde0wvvKdvr0R0WRs93dvQBSHnLGO7/vnApUTX3bTTwuWHXJzfrtfqUdpt5 5qNh8sBZuJMkQV2J0lw0nfebK5us6rzSIGH8jsDq+aF2ETYyc/SE0n+VNYwY9p18pgfa fyo7JksWgzzZr2VKtejkrE7mgQVbVUz97QsAvd0D+4cdnUbhvBmr+4oLmBgLR3NkSlB9 wgug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=K1Rxu3No; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id r22-20020aa79636000000b00690c23d353asi1433676pfg.217.2023.10.20.01.48.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=K1Rxu3No; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id C85FA804C20F; Fri, 20 Oct 2023 01:48:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376538AbjJTIsR (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376515AbjJTIsO (ORCPT ); Fri, 20 Oct 2023 04:48:14 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D86ECD45; Fri, 20 Oct 2023 01:48:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791692; x=1729327692; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=0WNKWxhqnOM7fF435JX3yfg+v0y6tyX67g7zORiWNpU=; b=K1Rxu3No8QvnVNhWqN7dlrJGhSPWm4RGDd4KfZNlCk9v4+OGw4Tz92Lt G2ISJXJvrR7ZbaKZiSqdTZMp1c5meQ8He1py66vP3OxBW70VcE0KM5byR 8ge7xQTWQGr6T9fPyBTa8IqoBNnZMBBJ4fM3X4XbCCBT3XcTAkIr/j5W0 WM9j39xLdcqZvC8eJKHKKujJVbd3AXK2B5Jl2BhxAVop3FeyE9UxSdxUi DzLOcn15954Y4qcgPQfi5YPLKMIZeGBV8mBtv2tl83TRD8Bp50uvAWHQB fiWuKdAtwoa49gmByXHjXl4m+4Oo41naVAHEOzxeI9UzZEGeuqd1xd4rq g==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683501" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683501" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832161" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832161" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:47:47 -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 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 v1 1/8] ACPI: utils: Introduce acpi_dev_uid_match() for matching _UID Date: Fri, 20 Oct 2023 14:17:25 +0530 Message-Id: <20231020084732.17130-2-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-1-raag.jadav@intel.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263630294585961 X-GMAIL-MSGID: 1780263630294585961 Introduce acpi_dev_uid_match() helper that matches the device with supplied _UID string. Suggested-by: Andy Shevchenko Signed-off-by: Raag Jadav Reviewed-by: Andy Shevchenko --- drivers/acpi/utils.c | 40 +++++++++++++++++++++++++++++++++------- include/acpi/acpi_bus.h | 1 + include/linux/acpi.h | 5 +++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index 2ea14648a661..664b9890b625 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -768,28 +768,54 @@ 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, pass NULL to not check _UID. + * + * Matches UID in @adev with given @uid2. Absence of @uid2 will be treated as + * a match. If user wants to validate @uid2, it should be done before calling + * this function. This behaviour is as needed by most of its current users. + * + * Returns: + * - %true if matches or @uid2 is NULL. + * - %false otherwise. + */ +bool acpi_dev_uid_match(struct acpi_device *adev, const char *uid2) +{ + const char *uid1 = acpi_device_uid(adev); + + if (!uid2) + return true; + + return uid1 && !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. This behaviour is as needed by most of + * its current users. + * + * 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; - 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 254685085c82..d1fe6446ffe0 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -760,6 +760,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 Fri Oct 20 08:47: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: 155885 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913713vqb; Fri, 20 Oct 2023 01:48:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQ/3XqP2AfXOjyC93th1XKB6cf7Xrz7V+u/J9zLLmSdVP3JC8OZeTNGtJBRI7lwGwr6DzO X-Received: by 2002:a05:6358:429f:b0:166:d4e5:5039 with SMTP id s31-20020a056358429f00b00166d4e55039mr1318521rwc.22.1697791719792; Fri, 20 Oct 2023 01:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791719; cv=none; d=google.com; s=arc-20160816; b=czBOHYM6lXK9UEfjzSqcloWhvVuihH0HS2GG8/0iR1MyU9V7CLO0ITftVf/giw0uof Jq3vww2piIWj/mAcU5cwBALS5NeBSyHDqi2tXPFdjKSWHexw0V0a0d3ecQsfiQM0AoDF hF92hmvBf+NRGZpWb/9lXGqYDjh1uMCIUkLXNGMb1Nfu8vRnpS+IS6lb8/goIvX3NJ9R 16F9l3vASwrsBRZro7i58felY7/tJxmBCYWFIQ2klUpiSCkvPiClxNQkR8lmYXgb0yqR t3Kjik571i0sMSPE4wovCIKgAydy8zKmxNn7MTmq8KDR9sKclfYIoR1eg5z8LSgT7ofF 2ySA== 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=Xmk4iDFrEzQkOq3QAE7Kyw6zmlh+LAO+l0jEEaSfnw8=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=rAWdFgRsQRdTA/J6Fa5RzdwN+CecDub4FqNJpfs6Lf5oRaYqBT6TxgbvilXGpmGBL/ j/BjxPqEQdSAxShhxm0TKfaVbBh8MXdps0rqOjgu1GWxmVHb45PQDcSnyvzRKHCAeGKV nl3eYSyP/Fnm1jt7M0iHosQnAEkHa6niaXvnsRExF2qxwb/k/k60YjDOve2RxzZ8I2jn ExgCyQxez7+z0oAmJh71mAnW7cBCz7ZjSsttqnPe2ypCLVYg29oXZPfNTEFqCiNfQl3s dXbwNCicbkMx9FcuXJGRUkJ59pWMmMbL2SFnlAk8Vf7oqMy4qU9QP2GC86bXvDAyJ0Mf NWrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mbY5GsTd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id s19-20020a056a00195300b006ba8478b96fsi1536522pfk.30.2023.10.20.01.48.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mbY5GsTd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id EA4F481B5D0F; Fri, 20 Oct 2023 01:48:34 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376537AbjJTIsX (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376520AbjJTIsO (ORCPT ); Fri, 20 Oct 2023 04:48:14 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15B08D51; Fri, 20 Oct 2023 01:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791693; x=1729327693; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=yG6eK+7AGqw8L3P7iFJ1dEXh4HF5j+xoQ/khjB5EmKI=; b=mbY5GsTdFC0TmggcsJb0kFLlFkW6YcRx5dio91CcBjeRdsULsig6MtGv bJWAGudP8H1u4ZYqvNtbav4Uay5JdY1x37neorvIJx/jQtoooj0dmjG3c MeXON0N9S8Hlp+X6HIaDyO3xfAHDkVCha3bGg1vZHS9lQNdrqjz9B/PxH TX7o2wOEj3Z8n6r7KV2y1V8oC3fSWMXgRuk8WxMlC4mf5ZmC9eg8x3xmW 4k2vJ5mDL/h8zPvhrVkVvbSg36LINp5cC4C25TNvVLMO0A3s+H1gqJ2oq Y7q1FvOJ7VcrpimW1sTigj5w2Iw5BcLgIUGKEkoyvwlFqS8Ll1V0Zdbox w==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683522" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683522" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832166" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832166" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:47:52 -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 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 v1 2/8] pinctrl: intel: use acpi_dev_uid_match() for matching _UID Date: Fri, 20 Oct 2023 14:17:26 +0530 Message-Id: <20231020084732.17130-3-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263650445975958 X-GMAIL-MSGID: 1780263650445975958 Convert manual _UID references to use standard ACPI helpers. 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 Fri Oct 20 08:47: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: 155884 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913690vqb; Fri, 20 Oct 2023 01:48:34 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNA7IpXOU/QvasBhJYI6pDxKdK+9ZEqC3p0/G9PChOfueVf63nqlO7pWVi48QIjKW7sLEj X-Received: by 2002:a17:903:2344:b0:1c9:c9ad:fab5 with SMTP id c4-20020a170903234400b001c9c9adfab5mr1309901plh.60.1697791714556; Fri, 20 Oct 2023 01:48:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791714; cv=none; d=google.com; s=arc-20160816; b=jur4F7cdvrcWFGcrtQxGUq/rkDd1QT4Y6pijaTC4dJBZZ5qCPm2asjculgCDyXGaXS hCycuKKLKBpOouO0nEcdYLVatKFrAZhoQlDK2dJMxFez6AvgXod///Qa+sS/w1VAInV9 GzeDq8CzuZqsCg9cxKa4PjPPPTpYp0tvvGk6U8ByMdlpXtyu7q9OtDsf9GEi5q0F/NsX Pt+JSpZ+4H2xriYU/oHbcGPYFUIJLdSosC1kI7laoR54SPYRFePqZGc7yicGTQTMVQ7m 2FHCZNn5/P59teRnEvTJ1XJRuNCD7SW1l1UwiooxsW0aClVxFo4r9sQ9HHEOUEYgktET RW0Q== 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=0d5YnslamlesyvKL6qrM29IAstK+PMagJVtaLw7GfIk=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=sadN3cDpNWTKy0Ugui/puEc+9OAUEmcvg05K5Yj5GeMfff7TsnX9G1DUfqngvStke2 mRH5nNw5oiaa91olrDrcWBKKtFOYv9piZhDAlJEfdmlTh+QjKZzVNnp42HzrkyJDfN2l cc6nx3PXjsEflCTrTdCDYIprki9k/OovKWRFs8uO5Y/JhJ1NaWfaFh/Ju9C9T+aDBiNS k9GcIZEvCkToE8mbnyUrnen0l2m/srKVgav/cOlKfb4/CVZOKK2nTma6LOnKhUaAjCz4 72MKPgu0VtDFSuh8eyvE5N2uZCbyVStX2kFCzhNshd7tGbN0VBPsK7DqdaNxx5WACUJS dHGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CMEDCpUP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id o13-20020a170902d4cd00b001bc17ab8d6esi1456486plg.530.2023.10.20.01.48.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CMEDCpUP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 89F7081B5D0F; Fri, 20 Oct 2023 01:48:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376549AbjJTIsU (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376519AbjJTIsO (ORCPT ); Fri, 20 Oct 2023 04:48:14 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D9FAD49; Fri, 20 Oct 2023 01:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791692; x=1729327692; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=1P08c+02XrBKccGcreruYeIgD28f7+s17ZZyX78daGc=; b=CMEDCpUPJOswyAe6+vH3IfTQrD2FzFchFXSwCa591iFEzTBXlR3CDcem 2a6ljM4MO4+iNwOAJVNZgrPWUKZQlDL+a04uWR7DL0EYYvlPvKIcy8m6z bw5hW1HVBfTv5WlpgFa2Gg2RB2k1d4l8shW5WYSM42djjm+5prUOyT7hx WxuH4NZnMUaK8iZwVQAAaJcc1taPBNWSi36wQrJnnzHiVHPBccfsQZBB0 WDT4Q8vb8aBEwY7TrDBf3KIZkJLHjLXCQi5U05fgoIE9EDxK4iiSS75Bn U8+Kebjg6SA0yahw20UnMj6VPzJEQ3/LuoiHp7nkUNQw9lx+1PAsrr8th g==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683511" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683511" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832168" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832168" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:47:56 -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 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 v1 3/8] ACPI: sysfs: use acpi_device_uid() for fetching _UID Date: Fri, 20 Oct 2023 14:17:27 +0530 Message-Id: <20231020084732.17130-4-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:29 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263644658203954 X-GMAIL-MSGID: 1780263644658203954 Convert manual _UID references to use standard ACPI helpers. Signed-off-by: Raag Jadav --- drivers/acpi/device_sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c index b9bbf0746199..9d8e90744cb5 100644 --- a/drivers/acpi/device_sysfs.c +++ b/drivers/acpi/device_sysfs.c @@ -410,7 +410,7 @@ static ssize_t uid_show(struct device *dev, { struct acpi_device *acpi_dev = to_acpi_device(dev); - return sprintf(buf, "%s\n", acpi_dev->pnp.unique_id); + return sprintf(buf, "%s\n", acpi_device_uid(acpi_dev)); } static DEVICE_ATTR_RO(uid); @@ -554,7 +554,7 @@ int acpi_device_setup_files(struct acpi_device *dev) if (dev->pnp.type.bus_address) result = device_create_file(&dev->dev, &dev_attr_adr); - if (dev->pnp.unique_id) + if (acpi_device_uid(dev)) result = device_create_file(&dev->dev, &dev_attr_uid); if (acpi_has_method(dev->handle, "_SUN")) { @@ -635,7 +635,7 @@ void acpi_device_remove_files(struct acpi_device *dev) if (acpi_has_method(dev->handle, "_HRV")) device_remove_file(&dev->dev, &dev_attr_hrv); - if (dev->pnp.unique_id) + if (acpi_device_uid(dev)) device_remove_file(&dev->dev, &dev_attr_uid); if (dev->pnp.type.bus_address) device_remove_file(&dev->dev, &dev_attr_adr); From patchwork Fri Oct 20 08:47: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: 155887 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913756vqb; Fri, 20 Oct 2023 01:48:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEi20cSF5ZjzkBLRRlwOXnQyhcLSOtOJTa24JPtCxFk4VRgoNLmnrmIcJXK2NL8j1yRs/jh X-Received: by 2002:a17:90b:1098:b0:27d:54b9:c3d4 with SMTP id gj24-20020a17090b109800b0027d54b9c3d4mr1303185pjb.1.1697791728060; Fri, 20 Oct 2023 01:48:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791728; cv=none; d=google.com; s=arc-20160816; b=ZMqEyBERrjYAFHBAyvyd/Puv9IAPLLjLIsbeScp4sjtiLFEK+h3XO+lb/uUM46HQIV HRfktx1R38iZs0MxN+jrOs0B9oAvwcHxBt7wyAWpvVUuI2BFYTZ+a9axpR1Zstfdwqbh 12+3nwITfTvA4GFhjGZ2xX6I/6zg0Iw5PdAwHpF075uMKN6uEagkwUgfXBYs60VXHf5f YiSqvtcx6NINI18Mqq3eAaCGpPUYbi7EHNv4pPV+Nyams3veYzNZaYGlxNWi7EQFKYJQ sLvRbJycoo7jKZ9ROkRJbH4kOHZDWlIQSR/0JHESUPn2Wh3MOdkFu8eATu9zUHADuzUS Kz5A== 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=kYa/xpwnZCtEe037BAOyBsZeRgBEad5iTJirNwI+95Y=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=hCml0qsnG5TajUofjwDfHhICJzqr/gE0ksAuSsBsveE5JcuBhMoqBgLbvS4RGk2Cre MC7WiyXLLt3oqFZ0IVZjBqjngq62zmxRj1F6tTvnxv8+N4rdFEl//9w2dDNTjZUaRxzE EQkZRpP9MdOPMF+aPj5f8sDZ8YEsCsONxK8Oiy5htlSx9TkCT19EziGPGMRl82TimZgS uCVA01ei/Q6/LhKbUcr34Pm37WtjvtKW+G8peMT95IvAV9sUDj2bEgT3brn/LPEtOOVb 9E5w2eOV8btFulcyH9XV8vJo+m8TBXGffCIYotNfrCCsRNXxIoydDwaLGs/lZkCwMvID wJwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DGUfNDHy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id kk2-20020a17090b4a0200b0026b51ae4574si4493202pjb.36.2023.10.20.01.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DGUfNDHy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 3AC9281F853F; Fri, 20 Oct 2023 01:48:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376561AbjJTIs1 (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376523AbjJTIsP (ORCPT ); Fri, 20 Oct 2023 04:48:15 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C69FED52; Fri, 20 Oct 2023 01:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791693; x=1729327693; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=ycYM//IBzYahr1OT+k/0SqcANs76449DXAt6/AuLX9M=; b=DGUfNDHyfUwZk67l/7ienlCmcACFM+T7a4497ecipvcMGwx61kTH96cj hjnCzgj9WGBuqM+LFN8O8o3+9/xOkEF2BA+lTCQnVDWD7hcve1H7IGHLI nLK7P48ZxPFlyKsutg+LrQgjACIV7Caxs6wZNmXM5vi0MKPZQbrEhQd/W Q8CYhzQeRCI96r5vfj5wRaj9L8v60Swjwd1o024ecpzsmjufeA/421ZF0 RGn0sW/HRZCp7U0/Sj+wR41rZlQ3XVciY8XDuSsrJGK3K/ygaQOI3r3Js 5U9Pfiy1CSvrtUs17fxQ7GO5GaXDwckDTfuFNsyGTe0ByS2544JgchEqI Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683524" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683524" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832171" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832171" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:48:01 -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 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 v1 4/8] ACPI: utils: use acpi_dev_uid_match() for matching _UID Date: Fri, 20 Oct 2023 14:17:28 +0530 Message-Id: <20231020084732.17130-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263658796646805 X-GMAIL-MSGID: 1780263658796646805 Convert manual _UID references to use standard ACPI helpers. Signed-off-by: Raag Jadav Reviewed-by: Andy Shevchenko --- 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 664b9890b625..e3ba835e6590 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -889,8 +889,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 (!acpi_dev_uid_match(adev, match->uid)) return 0; if (match->hrv == -1) From patchwork Fri Oct 20 08:47: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: 155888 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913780vqb; Fri, 20 Oct 2023 01:48:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPSpwhGj0AZAIx5fgbSc4aagPvUrZRkUDliaYoDQj9xhAVRrjPWOPYLILnF++SqcApstzN X-Received: by 2002:a05:6830:3a99:b0:6ce:ca0:eaef with SMTP id dj25-20020a0568303a9900b006ce0ca0eaefmr994547otb.26.1697791736196; Fri, 20 Oct 2023 01:48:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791736; cv=none; d=google.com; s=arc-20160816; b=YA0U3OT0x7T7ETxyRFv36XQc3kqcZ5XMJ4Y4ngqYy1NJ3nBwJQr/B0xgrNOXfy7Z9D 3euMXlOrDuVzGPJa3PLwso2HBJzVA/opfQZpY81MxqKQexS29sGYrrJAAYA33EYROzyI d/j5aefuk4+EYvEm1Xpe1rSU6ovc6toSbUNMi8hnl5gAUjaIdG5YCq66byrPpyCvOwBi ILUEieiTAw5BUz+9qHZyMvz+5mTkCLZXwTi+uFuO2YQHwJmunm+gzKXyufQhRBcIkwGP Yr80bxBiHUOc4YAOV3lExETLICjDwLcgiJ8qDSWzyULlt6d62SGfN77Uj9MUAAzGJpyf fyng== 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=+1kiw51XndKCVvgHaXpd9RVzPdX+k4IXFcF4uvowwJU=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=i+xVhKr4/VVYTWTeFGOXlZ7K1RlGH3ENqC25hnHhHTcVlgflY58z7Wz0OoTOK+H9kF t9po348v3Jx/nIdVIXJEuz3NRW2uWgRd+m3/pBWpfPRqx1qr5WYlaH7hR8v/i307ARMU dEoT6x6ZtDAObTzUUk6Xx4HVIo8mH5zp+EFbSLwKuh+sWJ+B9fF1suNgbLnxkAs+T4hN 0zeMbkf1gB60r2LKRbB6H/BHnXnQeR+M8xNTt2Y/s9RAC18dWzXKAFam4yVIoLyMxvZP qhUIQREopLl+oN9DPKe69Qw9ldHYzoM5dVG0qvh5OXxwFYOwIUoy6AMucOJeRw4VfA1h LOQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PAevwZtY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id r4-20020aa79624000000b006ba82adb9a6si1385121pfg.323.2023.10.20.01.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PAevwZtY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 0D540809D448; Fri, 20 Oct 2023 01:48:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376579AbjJTIsa (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376526AbjJTIsP (ORCPT ); Fri, 20 Oct 2023 04:48:15 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0EAB1A8; Fri, 20 Oct 2023 01:48:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791694; x=1729327694; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=t9Y0MIXw9ZdOFW0YKzuaiyfbehmFMxDrJh2lVaVPw5k=; b=PAevwZtY5B1P68Naw8GUrQbp0hWuSVe2NL+hG/QrwAIyhLV5YTnwlHzB iNfjWNKdnvZ1YnhMmg7v0ygzNYoGxfmYsL81oFkWXTVowrh9hNPTVNLgM iZc9wrnaGZTPJn+GVA0JcdLsoBC227v1B9EAx8k95DGwqHugkNDNzP+7O bzKldZuYXKCNfno+BuhsV96l/nCU/dV5LwzsOGc7X+u74NM+HJblRAkqM +uFuuq3sjxVbMDdgnmAKgygTrCf1OdNYufw1DeOxjA/gUTOGeErcqgcr7 1ctsnsKWSglfxxjwI03wQlXm7ahDx2sqqQ1qiujy70MbVOVM+aXWo7u3Q A==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683542" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683542" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832175" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832175" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:48:06 -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 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 v1 5/8] ACPI: x86: use acpi_dev_uid_match() for matching _UID Date: Fri, 20 Oct 2023 14:17:29 +0530 Message-Id: <20231020084732.17130-6-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263667647919651 X-GMAIL-MSGID: 1780263667647919651 Convert manual _UID references to use standard ACPI helpers. 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 Fri Oct 20 08:47: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: 155886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913746vqb; Fri, 20 Oct 2023 01:48:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFPAfWy7/O9+WE/MUYiXzG8TC7rYf9OxkiOggOMPOmZ0zlhTWxabd6ezFxq0uwQfbBMFBJb X-Received: by 2002:a17:903:186:b0:1b6:bced:1dc2 with SMTP id z6-20020a170903018600b001b6bced1dc2mr1136004plg.0.1697791726109; Fri, 20 Oct 2023 01:48:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791726; cv=none; d=google.com; s=arc-20160816; b=fz4VnA5GdMOraph5pCsdSeZyaEmZMnhDkFut11gPj3QLbFZcFhDPWFf8Hfkli1md8A BhpHZF6KcBoFVRkWpMSSG9mv8tEKBugDUbgDFvmQS0FpmPxXrr5YTP9GHJSgjY/7JFQp 65p0qL9pQVsXs7nIhJbK4EI2mImDouXRjlQWMFQQF4hdmBYXvWTfi2c9OwlYT33i9XMO TiT3ghpZQRXvVi9TcX/gG61aEAb6vQZ11qEuzy0ceEOEQHBzPX51iCl2txsMn2yH8ond CgMRYYojFIZGhWamlps8TbV+gz3FVYCfzmUPbJu7pxBg3zBkulXpl4uMnKAy86Da4CjO 8lZA== 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=Xz86ManxGp4kN1wQCNLv8x0ISNN1HHYKkGJa9r9OkXs=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=n9QRIiepbTmPq45H78f+evdlMDGLUMubLeaWMM2C48/BDzz9rGKNFI+4Zji1F5PLoH qKsU/1dsudj+DJZg3/DKwn0GTY2PnOD068yxCde1alP1sArBOKl495csP2b9R7EZ7qGD V44kyAmpDPjY99kehdZALCN6Vw9oXUTlZenZEoKbls3lrvrvO9PUjHxAnaHNCZzCcwoC dguJ/i6KuPLBEdapuGpeoZdIvS7tfU8iKkGC4TZCbxwKOdqYf6+WeLjBUQf1uR+V1faX P0V06FlDI7SBfiVjpGE1KRKX0axyLvSV6u7QHPpMiAJmyh3iK0Fx/93h6Mg096BddCD8 zp/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Dipm04id; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id z7-20020a1709028f8700b001c9c89fd36dsi1300871plo.203.2023.10.20.01.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Dipm04id; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id B9BED82B9D4A; Fri, 20 Oct 2023 01:48:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376574AbjJTIsd (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376541AbjJTIsS (ORCPT ); Fri, 20 Oct 2023 04:48:18 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C313D46; Fri, 20 Oct 2023 01:48:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791696; x=1729327696; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=rSipyHhM4gYIUQSn5eaLq9kVKKAAb0HFtJJ9r0gwffo=; b=Dipm04idYkMzuxfKEQvNTRUbQWb2ofdTihZCQQj2sc6TfyIXHrgtj07j niId35sdlDZojEhH7IIj6anL8A5+17T1e0sEgCUF5qNhnhKi3zMwIteTz Iajuxz2WXrCqx/xLvXl8lEYikhG6R5eBb2YvjTMz8pXtqukDo6HwwTseJ CZRmJr58cLmyW9tLGosDD25+YhqSZVyIozYeO8G6VJJ/sIkxzHM3QcFUu KLLGXVO9v2laRFdNkTAIHec9rFcj/7bRCnVRKtI+2Iyc6MmB81pQ93vOD onaDFmBgBtlNSQOUdMU14QfYM+mezRiTjSL5disOSBKjztHHRTk9NlVBE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683586" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683586" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832186" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832186" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:48:11 -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 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 v1 6/8] perf: qcom: use acpi_device_uid() for fetching _UID Date: Fri, 20 Oct 2023 14:17:30 +0530 Message-Id: <20231020084732.17130-7-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.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 (fry.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263657238807674 X-GMAIL-MSGID: 1780263657238807674 Convert manual _UID references to use standard ACPI helpers. Signed-off-by: Raag Jadav --- drivers/perf/qcom_l3_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/perf/qcom_l3_pmu.c b/drivers/perf/qcom_l3_pmu.c index 2887edb4eb0b..f16783d03db7 100644 --- a/drivers/perf/qcom_l3_pmu.c +++ b/drivers/perf/qcom_l3_pmu.c @@ -742,8 +742,8 @@ static int qcom_l3_cache_pmu_probe(struct platform_device *pdev) l3pmu = devm_kzalloc(&pdev->dev, sizeof(*l3pmu), GFP_KERNEL); name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "l3cache_%s_%s", - acpi_dev_parent(acpi_dev)->pnp.unique_id, - acpi_dev->pnp.unique_id); + acpi_device_uid(acpi_dev_parent(acpi_dev)), + acpi_device_uid(acpi_dev)); if (!l3pmu || !name) return -ENOMEM; From patchwork Fri Oct 20 08:47:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 155890 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913831vqb; Fri, 20 Oct 2023 01:49:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2A7pOdb7fsyEy+8Ls0dBVHuhYIXGLqejlD8+KzKinbUKS2ULx4U+Y+5dXUf/0JAlITjXd X-Received: by 2002:a25:8212:0:b0:d9a:4bc3:226e with SMTP id q18-20020a258212000000b00d9a4bc3226emr1041741ybk.37.1697791746354; Fri, 20 Oct 2023 01:49:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791746; cv=none; d=google.com; s=arc-20160816; b=He2eiDZop+/HOyfce4uTPGwC6q6peyy4lFYrY9/ERZ/jaLb67ulc1ALOjG53t1rGhQ D7jlWE3s8KbyJrPgFkU4PJnB7dCTiKQkGinEwBJsIOxloOeVMOTNK8mfFeG+Q2FM6ait HdsC3NjG9BloXuzVwXlC1MDhiZ65DKfCpepwTP8bRcZKPnZ2kVuFDvHYTEg+ywsK8tGi i5GV7JVfL106m6PgYNsSg3RgsEEnqiduJ8Yl6AxvObs6fZH3hUtJk960Eab0htoS6cnS 82rKLQ8Hvb/fc08oPE6FZlO6rnxKViZSiVBeiwDBqPqViFUL1HcwpRz1gKysu1H9WjAv cGeg== 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=YLWHOj5EdRcjrtiFbZpabhnnkLUZ9VIvg6RwhgBvVQw=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=PiMbHsHbJDUpS2qPoUGi4Wa4aYgOU1p9XHEgjhaPfg5QC786tYhtD0LM5/ZeZgOusV mC+cRueecJRJ8qLJcRAWarTWEXcXFefZhQTre+OdPwoLxBdemk5KRwk56nRfHDwibLKK 4OOML+GRaO07jsZvi0KVHuueJm/Afze3sol7IRrgX+HrJYavm4iDijGhALBEPr1aIKIO ybiabpvVlGMJjQMz4+nvP8aT1/J+OaLOXkru928TQJeEyqM1FUhSZuyKx5bwL1Ut0J7W EZeJso+mh1UPIcLCPC0/92i1+tk608L4U9sIQWqmvAiXvcBuH3nrsXOC2YVUr9WCKrni eANw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OJJrz6hA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id q3-20020aa79603000000b006910a45a23bsi1385729pfg.366.2023.10.20.01.49.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:49:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=OJJrz6hA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 48997819705C; Fri, 20 Oct 2023 01:49:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376521AbjJTIsh (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376564AbjJTIsX (ORCPT ); Fri, 20 Oct 2023 04:48:23 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41E48D64; Fri, 20 Oct 2023 01:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791701; x=1729327701; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=VTxu+ilZT0ByPxEPyTKRaS8c0W/p+nQekrV/1V+4jQc=; b=OJJrz6hApE3sw6lDZqb8SB4GEC11s7v/9R+obMP2aEzczlg9uNzAIPSH H3pMB+a0CrRfIQL1lA4DqROiojZnyGBB4bZ33HYgdW/JKK3/scW0GJthy 6KJ/qeyPyziR8NZ4pULcMwT9E0ila2iHvm1NHEEH9wsEXJ6HgP3B6vjMv 5Tu7T20Z+XagQo7xp4D7PtmfPpvry9lCVmkWNKjkr5y1PRkyj2iFinB5W YKzs4HEV961WbhAI2nq2fMFsjNDMDQHI82ZQ9drhNAtWtUObSWzjEPSO/ xnCiUi7LWmkJXe+EjeEHfK6QgjaOW0ryJ4xByqY+9SYtuk7+uCMmtJf12 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683647" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683647" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832198" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832198" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:48:16 -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 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 v1 7/8] hwmon: nct6775: use acpi_dev_hid_uid_match() for matching _HID and _UID Date: Fri, 20 Oct 2023 14:17:31 +0530 Message-Id: <20231020084732.17130-8-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:49:04 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263678302673250 X-GMAIL-MSGID: 1780263678302673250 Convert manual _UID references to use standard ACPI helpers. 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 Fri Oct 20 08:47:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 155889 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp913786vqb; Fri, 20 Oct 2023 01:48:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAzlx+YXAuqXpHCL2QuHL90rOW/9zJq5hHuGbRF3wjBKi/wTmLPZvovwYDl/o7NHqSl4LG X-Received: by 2002:a25:324b:0:b0:d9a:fd25:e3ef with SMTP id y72-20020a25324b000000b00d9afd25e3efmr999663yby.64.1697791738241; Fri, 20 Oct 2023 01:48:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697791738; cv=none; d=google.com; s=arc-20160816; b=OqegCiN6JBpdVT4rDsgWj4gPgfutaKTI7fNVB6RP9ufNZkNtdi1cRzN7wOwFofBeGz 2jhU106NalT6kAHZ/bemGdmBO27J8z5PMV+6rv94wD+zgSn7FEFwfx9Q0hSJtCn7M4bo 7MBPa9XawGpItFdRstjBubM+x3K1+Qfdxr4xJCBcnsWnRH4MagLPHdlmupvczSe3bFZL DF5R04oBLQPqonhlJEYGT6JSdoolfPqQF6Nw7AMcYMvj7+A1LDDJCFARzUZOpAT+lNUQ WMvdMLkJQvwTBeyPP+3V9t7cSmUE+HoaiY6QM2aXZ2bjanBp8as12WxXR23OQrg92TYu 3vfw== 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=tZKLbE/+K46xILJucBdIAM8DSQmbZt8m1HII1Ja5WA0=; fh=WAU8dvHbCVEKt7PKP55MCP59DfghQ92mfS2Ma7uEses=; b=izznOvqKtf3awCc9qdZW7l1yErkFQ2aCbgVEYN3dVc2GeWdMLQQm8YbOwfFc96Spdh WvqxLWSxRMU1PYOUaTlw6dwkEhXfogRyMFOlljN3xAUXZ7EDYMoxegRvtSRntq+F8bfB ASMtThjb4U1u66+zhhq65rACXNiN3UkLHE3yyVttxiIgWuB1DsypltG6avWuShRHmKvq V0hEUEgrOxSVKJ0xXYAx6KkaOXj1/LyZU7i14ve2GGF790Xs2hRcWbYjXtprpjU6qmWq ToxXXC866wBRt6bjcYbnwLCLRIXuhEq7u9giDyAch6ws+QOugvcptoX0SgOgqk2GmKBB jF1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mFNw4VWF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id f22-20020a631f16000000b00577f4d85fdbsi1447811pgf.548.2023.10.20.01.48.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 01:48:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mFNw4VWF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 1546B83348BB; Fri, 20 Oct 2023 01:48:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376534AbjJTIsj (ORCPT + 25 others); Fri, 20 Oct 2023 04:48:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376572AbjJTIs3 (ORCPT ); Fri, 20 Oct 2023 04:48:29 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.31]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1900D55; Fri, 20 Oct 2023 01:48:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697791705; x=1729327705; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=pUffY3rZpA/Ma3FQvoHxe1V6N2z+ycJPoTJ6FPj6xDw=; b=mFNw4VWFCEKJxzxdn/4rHI+pg9qbQrr+bQ46f3focuCnMNRjviTjExV7 ZEBBgqxmuOppAVzSZ3r9W//s79JgHeyRWlH9tvg8FYxn+Ye8BtIpJnOTW qXV8iZOC+4c90XjdOQBftd0suwRqs05Dc7qkHlZj3nZsCSc2o03Zi52RF 4emVoD0luk2VR7IU6PE8FepiPndx15zxjGVqtfwiUcgJ9vxqvvRcfI2NV H503ny4lOVfWFLX7AHLhwdqUtbxCR4lT5vR4o4IF92+C34kk3NS5496TE QRLPj85d6cyQecYaOI2mvf5rm1ID5LQWFhE7LoRgstOfuUVBsz47zIIrD Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="450683685" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="450683685" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2023 01:48:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10868"; a="873832206" X-IronPort-AV: E=Sophos;i="6.03,238,1694761200"; d="scan'208";a="873832206" Received: from inlubt0316.iind.intel.com ([10.191.20.213]) by fmsmga002.fm.intel.com with ESMTP; 20 Oct 2023 01:48:21 -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 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 v1 8/8] perf: arm_cspmu: use acpi_dev_hid_uid_match() for matching _HID and _UID Date: Fri, 20 Oct 2023 14:17:32 +0530 Message-Id: <20231020084732.17130-9-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231020084732.17130-1-raag.jadav@intel.com> References: <20231020084732.17130-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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Fri, 20 Oct 2023 01:48:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780263669498741343 X-GMAIL-MSGID: 1780263669498741343 Convert manual _UID references to use 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);