thermal: Replace acpi_bus_get_device()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 26 Jan 2022 19:45:17 +0000 (20:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 4 Feb 2022 18:33:18 +0000 (19:33 +0100)
Replace acpi_bus_get_device() that is going to be dropped with
acpi_fetch_acpi_dev().

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c

index e90690a..01b8033 100644 (file)
@@ -72,7 +72,6 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
        int i;
        int nr_bad_entries = 0;
        struct trt *trts;
-       struct acpi_device *adev;
        union acpi_object *p;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_buffer element = { 0, NULL };
@@ -112,12 +111,10 @@ int acpi_parse_trt(acpi_handle handle, int *trt_count, struct trt **trtp,
                if (!create_dev)
                        continue;
 
-               result = acpi_bus_get_device(trt->source, &adev);
-               if (result)
+               if (!acpi_fetch_acpi_dev(trt->source))
                        pr_warn("Failed to get source ACPI device\n");
 
-               result = acpi_bus_get_device(trt->target, &adev);
-               if (result)
+               if (!acpi_fetch_acpi_dev(trt->target))
                        pr_warn("Failed to get target ACPI device\n");
        }
 
@@ -149,7 +146,6 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
        int i;
        int nr_bad_entries = 0;
        struct art *arts;
-       struct acpi_device *adev;
        union acpi_object *p;
        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
        struct acpi_buffer element = { 0, NULL };
@@ -191,16 +187,11 @@ int acpi_parse_art(acpi_handle handle, int *art_count, struct art **artp,
                if (!create_dev)
                        continue;
 
-               if (art->source) {
-                       result = acpi_bus_get_device(art->source, &adev);
-                       if (result)
-                               pr_warn("Failed to get source ACPI device\n");
-               }
-               if (art->target) {
-                       result = acpi_bus_get_device(art->target, &adev);
-                       if (result)
-                               pr_warn("Failed to get target ACPI device\n");
-               }
+               if (!acpi_fetch_acpi_dev(art->source))
+                       pr_warn("Failed to get source ACPI device\n");
+
+               if (!acpi_fetch_acpi_dev(art->target))
+                       pr_warn("Failed to get target ACPI device\n");
        }
 
        *artp = arts;