summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2014-02-12 03:53:58 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-02-24 13:15:28 +0100
commit09bafc30b6fea0b374ac4ff0b8e923c07f5cda78 (patch)
treef064121ad7b6f05000e47fe4eea06ca46ae053c5
parentgpio: pca953x: Fix gpio_base may not default to -1 (diff)
downloadlinux-09bafc30b6fea0b374ac4ff0b8e923c07f5cda78.tar.xz
linux-09bafc30b6fea0b374ac4ff0b8e923c07f5cda78.zip
gpio: pl061: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/gpio/gpio-pl061.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 062a1be74929..e528cb2b12aa 100644
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -302,18 +302,9 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
irq_base = 0;
}
- if (!devm_request_mem_region(dev, adev->res.start,
- resource_size(&adev->res), "pl061")) {
- dev_err(&adev->dev, "no memory region\n");
- return -EBUSY;
- }
-
- chip->base = devm_ioremap(dev, adev->res.start,
- resource_size(&adev->res));
- if (!chip->base) {
- dev_err(&adev->dev, "could not remap memory\n");
- return -ENOMEM;
- }
+ chip->base = devm_ioremap_resource(dev, &adev->res);
+ if (IS_ERR(chip->base))
+ return PTR_ERR(chip->base);
spin_lock_init(&chip->lock);