From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jingoo Han Subject: [PATCH] DRM: Armada: Use devm_ioremap_resource() Date: Thu, 03 Apr 2014 09:31:04 +0900 Message-ID: <001e01cf4ed3$ff410170$fdc30450$%han@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id 967156E7D5 for ; Wed, 2 Apr 2014 17:31:07 -0700 (PDT) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3F000HKIRSTAB0@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 03 Apr 2014 09:31:05 +0900 (KST) Content-language: ko List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: 'David Airlie' Cc: 'Russell King' , 'Jingoo Han' , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource(). Signed-off-by: Jingoo Han --- drivers/gpu/drm/armada/armada_crtc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c index d8e3982..23b0123 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1037,10 +1037,10 @@ 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) { + base = devm_ioremap_resource(dev->dev, res); + if (IS_ERR(base)) { DRM_ERROR("failed to ioremap register\n"); - return -ENOMEM; + return PTR_ERR(base); } dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL); -- 1.7.10.4