Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[linux-2.6-microblaze.git] / drivers / perf / arm_cspmu / arm_cspmu.c

diff --git a/drivers/perf/arm_cspmu/arm_cspmu.c b/drivers/perf/arm_cspmu/arm_cspmu.c
index 9f478f2..2cc35dd 100644 (file)
--- a/drivers/perf/arm_cspmu/arm_cspmu.c
+++ b/drivers/perf/arm_cspmu/arm_cspmu.c
@@ -1108,7 +1108,7 @@ static int arm_cspmu_request_irq(struct arm_cspmu *cspmu)
 
 static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
 {
-       u32 acpi_uid;
+       u64 acpi_uid;
        struct device *cpu_dev;
        struct acpi_device *acpi_dev;
 
@@ -1118,10 +1118,8 @@ static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
 
        acpi_dev = ACPI_COMPANION(cpu_dev);
        while (acpi_dev) {
-               if (!strcmp(acpi_device_hid(acpi_dev),
-                           ACPI_PROCESSOR_CONTAINER_HID) &&
-                   !kstrtouint(acpi_device_uid(acpi_dev), 0, &acpi_uid) &&
-                   acpi_uid == container_uid)
+               if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, NULL) &&
+                   !acpi_dev_uid_to_integer(acpi_dev, &acpi_uid) && acpi_uid == container_uid)
                        return 0;
 
                acpi_dev = acpi_dev_parent(acpi_dev);