From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tushar Behera Subject: [PATCH 2/5] DRM: Armada: Use devm_ioremap_resource Date: Thu, 31 Oct 2013 16:38:04 +0530 Message-ID: <1383217687-12037-3-git-send-email-tushar.behera@linaro.org> References: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> Return-path: In-Reply-To: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: patches@linaro.org, dri-devel@lists.freedesktop.org, Russell King , David Airlie List-Id: dri-devel@lists.freedesktop.org While at it, propagate the error code. Signed-off-by: Tushar Behera CC: dri-devel@lists.freedesktop.org CC: Russell King CC: David Airlie --- 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