[PATCH 1/3] DRM: Armada: Use devm_ioremap_resource
Wolfram Sang
wsa at the-dreams.de
Thu Jun 19 11:48:59 PDT 2014
From: Tushar Behera <tushar.behera at linaro.org>
While at it, propagate the error code.
Signed-off-by: Tushar Behera <tushar.behera at linaro.org>
Signed-off-by: Wolfram Sang <wsa at the-dreams.de>
---
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 81c34f949dfc..3aedf9e993e6 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1039,11 +1039,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) {
--
2.0.0
More information about the dri-devel
mailing list