Skip to content

Commit 38dd7b7

Browse files
raagjadavrafaeljw
authored andcommitted
perf: arm_cspmu: drop redundant acpi_dev_uid_to_integer()
Now that we have _UID matching support for integer types, we can use acpi_dev_hid_uid_match() for it. Signed-off-by: Raag Jadav <raag.jadav@intel.com> Acked-by: Will Deacon <will@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent 9e93507 commit 38dd7b7

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/perf/arm_cspmu/arm_cspmu.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,6 @@ static int arm_cspmu_request_irq(struct arm_cspmu *cspmu)
11081108

11091109
static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
11101110
{
1111-
u64 acpi_uid;
11121111
struct device *cpu_dev;
11131112
struct acpi_device *acpi_dev;
11141113

@@ -1118,8 +1117,7 @@ static inline int arm_cspmu_find_cpu_container(int cpu, u32 container_uid)
11181117

11191118
acpi_dev = ACPI_COMPANION(cpu_dev);
11201119
while (acpi_dev) {
1121-
if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, NULL) &&
1122-
!acpi_dev_uid_to_integer(acpi_dev, &acpi_uid) && acpi_uid == container_uid)
1120+
if (acpi_dev_hid_uid_match(acpi_dev, ACPI_PROCESSOR_CONTAINER_HID, container_uid))
11231121
return 0;
11241122

11251123
acpi_dev = acpi_dev_parent(acpi_dev);

0 commit comments

Comments
 (0)