Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...

[linux.git] / drivers / perf / arm_smmuv3_pmu.c

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index abcf54f7d19c94cc7031e1561b91c6eb42d91cb7..773128f411f1e93e57059280221fbb4cad7d86f7 100644 (file)
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -727,7 +727,7 @@ static void smmu_pmu_get_acpi_options(struct smmu_pmu *smmu_pmu)
 static int smmu_pmu_probe(struct platform_device *pdev)
 {
        struct smmu_pmu *smmu_pmu;
-       struct resource *res_0, *res_1;
+       struct resource *res_0;
        u32 cfgr, reg_size;
        u64 ceid_64[2];
        int irq, err;
@@ -764,8 +764,7 @@ static int smmu_pmu_probe(struct platform_device *pdev)
 
        /* Determine if page 1 is present */
        if (cfgr & SMMU_PMCG_CFGR_RELOC_CTRS) {
-               res_1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               smmu_pmu->reloc_base = devm_ioremap_resource(dev, res_1);
+               smmu_pmu->reloc_base = devm_platform_ioremap_resource(pdev, 1);
                if (IS_ERR(smmu_pmu->reloc_base))
                        return PTR_ERR(smmu_pmu->reloc_base);
        } else {