diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-01-02 22:29:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-17 17:21:45 +0100 |
| commit | 8b9c6ab156b5a80d64e5a1d9c248cfcd61794dfc (patch) | |
| tree | 2b3deb7c86dd8a82a87046f3cd80473ba28ef814 /drivers/usb/typec | |
| parent | c3194949ae8fcbe2b7e38670e7c6a5cfd2605edc (diff) | |
| download | linux-stable-8b9c6ab156b5a80d64e5a1d9c248cfcd61794dfc.tar.gz linux-stable-8b9c6ab156b5a80d64e5a1d9c248cfcd61794dfc.tar.bz2 linux-stable-8b9c6ab156b5a80d64e5a1d9c248cfcd61794dfc.zip | |
usb: typec: intel_pmc_mux: Deduplicate ACPI matching in probe
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>
Diffstat (limited to 'drivers/usb/typec')
| -rw-r--r-- | drivers/usb/typec/mux/intel_pmc_mux.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index 87e2c9130607..34e4188a40ff 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -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) { |