[PATCH 2/5] DRM: Armada: Use devm_ioremap_resource

[Tushar Behera]

While at it, propagate the error code.

Signed-off-by: Tushar Behera <tushar.behera at linaro.org>
CC: dri-devel at lists.freedesktop.org
CC: Russell King <rmk+kernel at arm.linux.org.uk>
CC: David Airlie <airlied at linux.ie>
---
 drivers/gpu/drm/armada/armada_crtc.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_crtc.c 
b/drivers/gpu/drm/armada/armada_crtc.c
index d8e3982..2b6e7b7 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1037,11 +1037,9 @@ int armada_drm_crtc_create(struct drm_device *dev, 
unsigned num,
        if (ret)
                return ret;

-       base = devm_request_and_ioremap(dev->dev, res);
-       if (!base) {
-               DRM_ERROR("failed to ioremap register\n");
-               return -ENOMEM;
-       }
+       base = devm_ioremap_resource(dev->dev, res);
+       if (IS_ERR(base))
+               return PTR_ERR(base);

        dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
        if (!dcrtc) {
-- 
1.7.9.5