]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/chrome: cros_typec_switch: Use acpi_get_local_u64_address()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 20 Jan 2026 13:12:31 +0000 (14:12 +0100)
committerTzung-Bi Shih <tzungbi@kernel.org>
Wed, 21 Jan 2026 04:38:44 +0000 (04:38 +0000)
Now we have a helper so there's no need to open-code.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20260120131413.1697891-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
drivers/platform/chrome/cros_typec_switch.c

index d8a28d4e51a85eb694e2e93dcca603d8ae64a04e..fe0eddd2cf45bdcea27448fd65e701cc8a44f901 100644 (file)
@@ -211,9 +211,8 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)
        struct cros_typec_port *port;
        struct device *dev = sdata->dev;
        struct fwnode_handle *fwnode;
-       struct acpi_device *adev;
-       unsigned long long index;
        int nports, ret;
+       u64 index;
 
        nports = device_get_child_node_count(dev);
        if (nports == 0) {
@@ -228,17 +227,9 @@ static int cros_typec_register_switches(struct cros_typec_switch_data *sdata)
                        goto err_switch;
                }
 
-               adev = to_acpi_device_node(fwnode);
-               if (!adev) {
-                       dev_err(dev, "Couldn't get ACPI device handle for %pfwP\n", fwnode);
-                       ret = -ENODEV;
-                       goto err_switch;
-               }
-
-               ret = acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index);
-               if (ACPI_FAILURE(ret)) {
+               ret = acpi_get_local_u64_address(ACPI_HANDLE_FWNODE(fwnode), &index);
+               if (ret) {
                        dev_err(dev, "_ADR wasn't evaluated for %pfwP\n", fwnode);
-                       ret = -ENODATA;
                        goto err_switch;
                }