From patchwork Thu Apr 3 00:31:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3933231 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7466B9F96D for ; Thu, 3 Apr 2014 15:52:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B283F20272 for ; Thu, 3 Apr 2014 15:52:24 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 64817202EC for ; Thu, 3 Apr 2014 15:52:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C9BD66E782; Thu, 3 Apr 2014 08:52:06 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org 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) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 78.ED.09028.8CBAC335; Thu, 03 Apr 2014 09:31:04 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-fb-533cabc82c9e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 92.53.28157.8CBAC335; Thu, 03 Apr 2014 09:31:04 +0900 (KST) Received: from DOJG1HAN03 ([12.36.166.146]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N3F009SKIRSZI50@mmp2.samsung.com>; Thu, 03 Apr 2014 09:31:04 +0900 (KST) From: Jingoo Han To: 'David Airlie' 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 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac9O0/rjmtczj/fhTZKiP5FwxqID3w== Content-language: ko x-cr-hashedpuzzle: BFle BKmC Bqre RM4d S6AV TNhc bQHi cC9m catv i2nh jZzS pfrb p4cw qTLs q1vG vUiX; 4; YQBpAHIAbABpAGUAZABAAGwAaQBuAHUAeAAuAGkAZQA7AGQAcgBpAC0AZABlAHYAZQBsAEAAbABpAHMAdABzAC4AZgByAGUAZQBkAGUAcwBrAHQAbwBwAC4AbwByAGcAOwBqAGcAMQAuAGgAYQBuAEAAcwBhAG0AcwB1AG4AZwAuAGMAbwBtADsAcgBtAGsAKwBrAGUAcgBuAGUAbABAAGEAcgBtAC4AbABpAG4AdQB4AC4AbwByAGcALgB1AGsA; Sosha1_v1; 7; {C3371920-1F33-4B99-A641-696DEF156629}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Thu, 03 Apr 2014 00:30:57 GMT; WwBQAEEAVABDAEgAXQAgAEQAUgBNADoAIABBAHIAbQBhAGQAYQA6ACAAVQBzAGUAIABkAGUAdgBtAF8AaQBvAHIAZQBtAGEAcABfAHIAZQBzAG8AdQByAGMAZQAoACkA x-cr-puzzleid: {C3371920-1F33-4B99-A641-696DEF156629} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsVy+t8zY90Tq22CDRauMbfoPXeSyeLK1/ds FpcXXmK12PzhJZsDi0dLcw+bx/ZvD1g97ncfZ/Lo27KKMYAlissmJTUnsyy1SN8ugStj9oNP TAXt7BV7W2ayNjD+ZO1i5OSQEDCReD1rGxOELSZx4d56ti5GLg4hgWWMElNWdMIVPVnVywqR mM4oseXbNHYI5zejxOX2WWwgVWwCahJfvhwGSnBwiAioSkw7bQ8SZhaolHg+ezMjiC0sYCmx bs9/sG0sQCW3fy5iBrF5BWwlepfPYYGwBSV+TL7HAtGrJbF5WxMrhC0vsXnNW2aQ8RIC6hKP /uqChEUE9CQO9K9mgygRkdj34h0jyGkSAl9YJE7NWMkI8YCpxOuOU+wQiUvsEr8W/2WEOEJA 4tvkQywQQ2UlNh1ghqiXlDi44gbLBEaJWUhOmoXkpFlITpqFZPcCRpZVjKKpBckFxUnpRUZ6 xYm5xaV56XrJ+bmbGCGR2beD8eYB60OMyUDrJzJLiSbnAyM7ryTe0NjMyMLUxNTYyNzSjDRh JXHeRQ+TgoQE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwmjyxnrutMfyp2t26hOpjIXenRLT/ /2vbfz+jz+P4rQmZJf15Rxv1Mn59W/Aj0qtZaR1b/TPjdzcTxF9yLnt9mXlRnNGfD/2Td15T Kaw9dOmOxe+gl7LzvISWSK89Wud7+BurhPo0P5nTUirzpi6aVx34+MLLIzVy5r1+B9XPxrdw ld0LUnukqMRSnJFoqMVcVJwIACdddjHiAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDKsWRmVeSWpSXmKPExsVy+t9jQd0Tq22CDbZdN7boPXeSyeLK1/ds FpcXXmK12PzhJZsDi0dLcw+bx/ZvD1g97ncfZ/Lo27KKMYAlqoHRJiM1MSW1SCE1Lzk/JTMv 3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdoqZJCWWJOKVAoILG4WEnfDtOE0BA3 XQuYxghd35AguB4jAzSQsI4xY/aDT0wF7ewVe1tmsjYw/mTtYuTkkBAwkXiyqhfKFpO4cG89 WxcjF4eQwHRGiS3fprFDOL8ZJS63z2IDqWITUJP48uUwUIKDQ0RAVWLaaXuQMLNApcTz2ZsZ QWxhAUuJdXv+M4HYLEAlt38uYgaxeQVsJXqXz2GBsAUlfky+xwLRqyWxeVsTK4QtL7F5zVtm kPESAuoSj/7qgoRFBPQkDvSvZoMoEZHY9+IdI8hpEgJfWCROzVjJCPGAqcTrjlPsExiFZiFZ MQvJillIVsxCMmsBI8sqRtHUguSC4qT0XCO94sTc4tK8dL3k/NxNjOC4fya9g3FVg8UhRgEO RiUeXkspm2Ah1sSy4srcQ4wSHMxKIrwqUUAh3pTEyqrUovz4otKc1OJDjMnAEJjILCWanA9M SXkl8YbGJmZGlkZmFkYm5uakCSuJ8x5stQ4UEkhPLEnNTk0tSC2C2cLEwSnVwDjpzdNFy091 KGaJ8u+I9ZuuLRx/hTVL5i9X13XB2UWM8g8WaB1t27dsw0ztf7VXI3kmJO4Pu8ns5+C0VeTL siuTvk/NXcMwc+GuOJnZqWyytvdfC0r35f81+J4wK3mxzsqqx/pyx6/U1hw/Y3Hu1nqZk1ct nrB16m3bN/vvdVWem30npiQuzD2jxFKckWioxVxUnAgAfZFDIj8DAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Thu, 03 Apr 2014 08:52:03 -0700 Cc: 'Russell King' , 'Jingoo Han' , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);