Commit 6fdba3db authored by Raag Jadav's avatar Raag Jadav Committed by Rafael J. Wysocki
Browse files

perf: arm_cspmu: use acpi_dev_hid_uid_match() for matching _HID and _UID 



Convert manual _UID references to use the standard ACPI helpers.

Signed-off-by: default avatarRaag Jadav <raag.jadav@intel.com>
Reviewed-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 45f56711

drivers/perf/arm_cspmu/arm_cspmu.c

+3 −5
Original line number Diff line number Diff line
@@ -1061,7 +1061,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;
@@ -1071,10 +1071,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);