usb: typec: intel_pmc_mux: Deduplicate ACPI matching in probe
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 2 Jan 2023 20:29:33 +0000 (22:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Jan 2023 16:21:45 +0000 (17:21 +0100)
There is no need to call acpi_dev_present() followed by
acpi_dev_get_first_match_dev() as they both do the same
with only difference in the returning value. Instead,
call the latter and check its result.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230102202933.15968-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/mux/intel_pmc_mux.c

index 87e2c91..34e4188 100644 (file)
@@ -602,16 +602,15 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc)
        int ret;
 
        for (dev_id = &iom_acpi_ids[0]; dev_id->id[0]; dev_id++) {
-               if (acpi_dev_present(dev_id->id, NULL, -1)) {
-                       pmc->iom_port_status_offset = (u32)dev_id->driver_data;
-                       adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1);
+               adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1);
+               if (adev)
                        break;
-               }
        }
-
        if (!adev)
                return -ENODEV;
 
+       pmc->iom_port_status_offset = (u32)dev_id->driver_data;
+
        INIT_LIST_HEAD(&resource_list);
        ret = acpi_dev_get_memory_resources(adev, &resource_list);
        if (ret < 0) {