usb: typec: intel_pmc_mux: Use the helper acpi_dev_get_memory_resources()
authorHeikki Krogerus <heikki.krogerus@linux.intel.com>
Wed, 7 Sep 2022 10:30:07 +0000 (13:30 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:39:37 +0000 (09:39 +0100)
[ Upstream commit 1538dc8c1561f0de4ba57a69e2a421a1a3951618 ]

It removes the need to check the resource data type
separately.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: c3194949ae8f ("usb: typec: intel_pmc_mux: Don't leak the ACPI device reference count")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/usb/typec/mux/intel_pmc_mux.c

index a2f5cfdcf02ac545c0dd4919bb14fe60e04e3c2a..8af60f0720435d350ed12f6a44fe49e9bb4e09fa 100644 (file)
@@ -563,15 +563,6 @@ err_unregister_switch:
        return ret;
 }
 
-static int is_memory(struct acpi_resource *res, void *data)
-{
-       struct resource_win win = {};
-       struct resource *r = &win.res;
-
-       return !(acpi_dev_resource_memory(res, r) ||
-                acpi_dev_resource_address_space(res, &win));
-}
-
 /* IOM ACPI IDs and IOM_PORT_STATUS_OFFSET */
 static const struct acpi_device_id iom_acpi_ids[] = {
        /* TigerLake */
@@ -605,7 +596,7 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc)
                return -ENODEV;
 
        INIT_LIST_HEAD(&resource_list);
-       ret = acpi_dev_get_resources(adev, &resource_list, is_memory, NULL);
+       ret = acpi_dev_get_memory_resources(adev, &resource_list);
        if (ret < 0)
                return ret;