Commit d5a8fb65 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

perf: qcom_l2_pmu: ACPI: Use ACPI_COMPANION() directly 



The ACPI_HANDLE() macro is a wrapper arond the ACPI_COMPANION()
macro and the ACPI handle produced by the former comes from the
ACPI device object produced by the latter, so it is way more
straightforward to evaluate the latter directly instead of passing
the handle produced by the former to acpi_bus_get_device().

Modify l2_cache_pmu_probe_cluster() accordingly (no intentional
functional impact).

While at it, rename the ACPI device pointer to adev for more
clarity.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent f0b2731b

drivers/perf/qcom_l2_pmu.c

+2 −5
Original line number Diff line number Diff line
@@ -840,17 +840,14 @@ static int l2_cache_pmu_probe_cluster(struct device *dev, void *data) 
{

	struct platform_device *pdev = to_platform_device(dev->parent);

	struct platform_device *sdev = to_platform_device(dev);

	struct acpi_device *adev = ACPI_COMPANION(dev);

	struct l2cache_pmu *l2cache_pmu = data;

	struct cluster_pmu *cluster;

	struct acpi_device *device;

	unsigned long fw_cluster_id;

	int err;

	int irq;



	if (acpi_bus_get_device(ACPI_HANDLE(dev), &device))

		return -ENODEV;



	if (kstrtoul(device->pnp.unique_id, 10, &fw_cluster_id) < 0) {

	if (!adev || kstrtoul(adev->pnp.unique_id, 10, &fw_cluster_id) < 0) {

		dev_err(&pdev->dev, "unable to read ACPI uid\n");

		return -ENODEV;

	}