From patchwork Mon Dec 13 10:32:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 524342 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B3E1C433FE for ; Mon, 13 Dec 2021 10:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241251AbhLMKeV (ORCPT ); Mon, 13 Dec 2021 05:34:21 -0500 Received: from mga14.intel.com ([192.55.52.115]:51594 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237920AbhLMKdl (ORCPT ); Mon, 13 Dec 2021 05:33:41 -0500 X-IronPort-AV: E=McAfee;i="6200,9189,10196"; a="238930010" X-IronPort-AV: E=Sophos;i="5.88,202,1635231600"; d="scan'208";a="238930010" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2021 02:32:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,202,1635231600"; d="scan'208";a="660821535" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 13 Dec 2021 02:32:42 -0800 From: Heikki Krogerus To: "Rafael J. Wysocki" , Greg Kroah-Hartman Cc: Andy Shevchenko , Sakari Ailus , Prashant Malani , linux-acpi@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] usb: Use the cached ACPI _PLD entry Date: Mon, 13 Dec 2021 13:32:40 +0300 Message-Id: <20211213103243.33657-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211213103243.33657-1-heikki.krogerus@linux.intel.com> References: <20211213103243.33657-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The _PLD is now stored, so there is no need to separately evaluate it. Signed-off-by: Heikki Krogerus --- drivers/usb/core/usb-acpi.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 50b2fc7fcc0e3..3b21c15be548f 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c @@ -176,22 +176,19 @@ usb_acpi_get_companion_for_port(struct usb_port *port_dev) static struct acpi_device * usb_acpi_find_companion_for_port(struct usb_port *port_dev) { + struct acpi_device_location *location; struct acpi_device *adev; - struct acpi_pld_info *pld; - acpi_handle *handle; - acpi_status status; adev = usb_acpi_get_companion_for_port(port_dev); if (!adev) return NULL; - handle = adev->handle; - status = acpi_get_physical_device_location(handle, &pld); - if (ACPI_SUCCESS(status) && pld) { - port_dev->location = USB_ACPI_LOCATION_VALID - | pld->group_token << 8 | pld->group_position; - port_dev->connect_type = usb_acpi_get_connect_type(handle, pld); - ACPI_FREE(pld); + location = acpi_device_get_location(adev); + if (location) { + port_dev->location = USB_ACPI_LOCATION_VALID | + location->pld->group_token << 8 | + location->pld->group_position; + port_dev->connect_type = usb_acpi_get_connect_type(adev->handle, location->pld); } return adev;