Merge tag 'char-misc-4.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-block.git] / drivers / perf / arm-ccn.c

diff --git a/drivers/perf/arm-ccn.c b/drivers/perf/arm-ccn.c
index 860f5bd8dce8f762b2ffc5ecab1a6ec03425b30a..7dd850e02f192e43fbb9ad3ab6868975d4170abe 100644 (file)
--- a/drivers/perf/arm-ccn.c
+++ b/drivers/perf/arm-ccn.c
@@ -1486,17 +1486,9 @@ static int arm_ccn_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, ccn);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res)
-               return -EINVAL;
-
-       if (!devm_request_mem_region(ccn->dev, res->start,
-                       resource_size(res), pdev->name))
-               return -EBUSY;
-
-       ccn->base = devm_ioremap(ccn->dev, res->start,
-                               resource_size(res));
-       if (!ccn->base)
-               return -EFAULT;
+       ccn->base = devm_ioremap_resource(ccn->dev, res);
+       if (IS_ERR(ccn->base))
+               return PTR_ERR(ccn->base);
 
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (!res)