From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A6CDEC433E0 for ; Fri, 29 May 2020 13:08:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8CFC6206B6 for ; Fri, 29 May 2020 13:08:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726476AbgE2NI0 (ORCPT ); Fri, 29 May 2020 09:08:26 -0400 Received: from mga03.intel.com ([134.134.136.65]:8279 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726282AbgE2NIZ (ORCPT ); Fri, 29 May 2020 09:08:25 -0400 IronPort-SDR: 69Hy92k7+DLoZMnJZ/T/JSryX0vdzZNgd76kjb4k7j/6ia5mj6BGBTKSwB1tCNyyxuG5DoPlCk RAYCVZLCXKlg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2020 06:08:25 -0700 IronPort-SDR: GcXI5mQ5BC1kA7im4TlEW67Jt3RGh/SKdJXSkcu6TrKgnS+kXtVIaqcRACeMeynYsSz37TeI5W +AzeIW0SNyvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,448,1583222400"; d="scan'208";a="443383206" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 29 May 2020 06:08:23 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CDD8BFC; Fri, 29 May 2020 16:08:22 +0300 (EEST) From: Andy Shevchenko To: Ard Biesheuvel , linux-efi@vger.kernel.org Cc: Andy Shevchenko , Lukas Wunner Subject: [PATCH v2] efi/dev-path-parser: Switch to acpi_dev_get_first_match_dev() Date: Fri, 29 May 2020 16:08:22 +0300 Message-Id: <20200529130822.52370-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org The acpi_dev_get_first_match_dev() helper will find and return an ACPI device pointer of the first registered device in the system by its HID and UID (if present). Use it instead of open coded variant. Cc: Lukas Wunner Signed-off-by: Andy Shevchenko --- v2: added Lukas to Cc (Ard), updated condition to handle UID=0 case drivers/firmware/efi/dev-path-parser.c | 43 +++++++++----------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/drivers/firmware/efi/dev-path-parser.c b/drivers/firmware/efi/dev-path-parser.c index 5c9625e552f4..d3e5123ab618 100644 --- a/drivers/firmware/efi/dev-path-parser.c +++ b/drivers/firmware/efi/dev-path-parser.c @@ -12,51 +12,36 @@ #include #include -struct acpi_hid_uid { - struct acpi_device_id hid[2]; - char uid[11]; /* UINT_MAX + null byte */ -}; - -static int __init match_acpi_dev(struct device *dev, const void *data) -{ - struct acpi_hid_uid hid_uid = *(const struct acpi_hid_uid *)data; - struct acpi_device *adev = to_acpi_device(dev); - - if (acpi_match_device_ids(adev, hid_uid.hid)) - return 0; - - if (adev->pnp.unique_id) - return !strcmp(adev->pnp.unique_id, hid_uid.uid); - else - return !strcmp("0", hid_uid.uid); -} - static long __init parse_acpi_path(const struct efi_dev_path *node, struct device *parent, struct device **child) { - struct acpi_hid_uid hid_uid = {}; + char hid[3 + 4 + 1]; /* 3 characters + 4 hex digits + null byte */ + char uid[10 + 1]; /* UINT_MAX + null byte */ + struct acpi_device *adev; struct device *phys_dev; if (node->header.length != 12) return -EINVAL; - sprintf(hid_uid.hid[0].id, "%c%c%c%04X", + sprintf(hid, "%c%c%c%04X", 'A' + ((node->acpi.hid >> 10) & 0x1f) - 1, 'A' + ((node->acpi.hid >> 5) & 0x1f) - 1, 'A' + ((node->acpi.hid >> 0) & 0x1f) - 1, node->acpi.hid >> 16); - sprintf(hid_uid.uid, "%u", node->acpi.uid); + sprintf(uid, "%u", node->acpi.uid); - *child = bus_find_device(&acpi_bus_type, NULL, &hid_uid, - match_acpi_dev); - if (!*child) + adev = acpi_dev_get_first_match_dev(hid, uid, -1); + if (!adev && !node->acpi.uid) + adev = acpi_dev_get_first_match_dev(hid, NULL, -1); + if (!adev) return -ENODEV; - phys_dev = acpi_get_first_physical_node(to_acpi_device(*child)); + phys_dev = acpi_get_first_physical_node(adev); if (phys_dev) { - get_device(phys_dev); - put_device(*child); - *child = phys_dev; + *child = get_device(phys_dev); + acpi_dev_put(adev); + } else { + *child = &adev->dev; } return 0; -- 2.26.2