From patchwork Tue Apr 8 04:55:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 3951941 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 923DB9F544 for ; Wed, 9 Apr 2014 01:05:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B90E420481 for ; Wed, 9 Apr 2014 01:05:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E32D320480 for ; Wed, 9 Apr 2014 01:05:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDFC96EA0E; Tue, 8 Apr 2014 18:05:52 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id B7F5D6E82A for ; Mon, 7 Apr 2014 21:55:44 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3P00CIO4CRTA00@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Tue, 08 Apr 2014 13:55:39 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id FA.8D.14803.A4183435; Tue, 08 Apr 2014 13:55:38 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-87-5343814a8ce6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id AA.D9.28157.94183435; Tue, 08 Apr 2014 13:55:38 +0900 (KST) Received: from DOJG1HAN03 ([12.36.166.146]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N3P007XV4CP2X00@mmp1.samsung.com>; Tue, 08 Apr 2014 13:55:37 +0900 (KST) From: Jingoo Han To: 'David Airlie' References: <001e01cf4ed3$ff410170$fdc30450$%han@samsung.com> In-reply-to: <001e01cf4ed3$ff410170$fdc30450$%han@samsung.com> Subject: [PATCH V2] DRM: Armada: Use devm_ioremap_resource() Date: Tue, 08 Apr 2014 13:55:37 +0900 Message-id: <008a01cf52e6$c8ab50e0$5a01f2a0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac9O0/rjmtczj/fhTZKiP5FwxqID3wEEq26A Content-language: ko x-cr-hashedpuzzle: HRIo J0S0 MdEf Nuly OQ4Q OfcK QE4R VNQE X+nC ZX9w ck/v iICa iKFF uNRb vcaX yMnx; 5; YQBpAHIAbABpAGUAZABAAGwAaQBuAHUAeAAuAGkAZQA7AGQAcgBpAC0AZABlAHYAZQBsAEAAbABpAHMAdABzAC4AZgByAGUAZQBkAGUAcwBrAHQAbwBwAC4AbwByAGcAOwBqAGcAMQAuAGgAYQBuAEAAcwBhAG0AcwB1AG4AZwAuAGMAbwBtADsAcgBtAGsAKwBrAGUAcgBuAGUAbABAAGEAcgBtAC4AbABpAG4AdQB4AC4AbwByAGcALgB1AGsAOwB0AGgAaQBlAHIAcgB5AC4AcgBlAGQAaQBuAGcAQABnAG0AYQBpAGwALgBjAG8AbQA=; Sosha1_v1; 7; {D834C700-7BEB-49F0-A6A5-BDC5E4BA3ECB}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Tue, 08 Apr 2014 04:55:30 GMT; WwBQAEEAVABDAEgAIABWADIAXQAgAEQAUgBNADoAIABBAHIAbQBhAGQAYQA6ACAAVQBzAGUAIABkAGUAdgBtAF8AaQBvAHIAZQBtAGEAcABfAHIAZQBzAG8AdQByAGMAZQAoACkA x-cr-puzzleid: {D834C700-7BEB-49F0-A6A5-BDC5E4BA3ECB} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t8zY12vRudggzVt3Ba9504yWVz5+p7N 4vLCS6wWmz+8ZLP4uWseiwOrR0tzD5vHzll32T22f3vA6nG/+ziTR9+WVYwBrFFcNimpOZll qUX6dglcGZP3XmAtmMtRsX7WNeYGxi9sXYycHBICJhLXuhayQNhiEhfurQeKc3EICSxjlDi7 4AY7TNHPSaeYQWwhgUWMEk+uVkPYvxklFuzWB7HZBNQkvnw5DFTPwSEioCox7bQ9yBxmkDmv pm9hgqi3lZh77QEjiM0pYCex8H0b2HxhARuJmX92gvWyAPV2fosECfMClTd9fcoCYQtK/Jh8 D8xmFtCSWL/zOBOELS+xec1bZpBWCQF1iUd/dSEuMJI4/1MRokJEYt+Ld4wQjxxgleg95Ath m0o0NW5hhbA/skt0N3CB2CwCAhLfJh9igZgoK7HpADNEiaTEwRU3WCYwSs1Ccs8sJPfMQnLP LCSbFzCyrGIUTS1ILihOSi8y1StOzC0uzUvXS87P3cQIiemJOxjvH7A+xJgMtH4is5Rocj4w JeSVxBsamxlZmJqYGhuZW5qRJqwkzpv+KClISCA9sSQ1OzW1ILUovqg0J7X4ECMTB6dUA+Pm tq/mojvOnYtKSquLf7n9uW3G9Oipuapvzh7Z+Kj+lkmRqBaDfGrxPlue4ykeP1z+SWSxLpnj FP2y6LPRQ/ZlC9ZFtqy5yp/9pOKsxOfYPzvs3i989Hf+rJxuhYe8DhltOYtvXtjW7VxTtr/n hJ3QnlqLOYE7XAzS1b78+Gx32M/pn9S8jZeUWIozEg21mIuKEwGJQ/t4/wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFKsWRmVeSWpSXmKPExsVy+t9jAV2vRudgg1P97Ba9504yWVz5+p7N 4vLCS6wWmz+8ZLP4uWseiwOrR0tzD5vHzll32T22f3vA6nG/+ziTR9+WVYwBrFENjDYZqYkp qUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5QOuVFMoSc0qBQgGJ xcVK+naYJoSGuOlawDRG6PqGBMH1GBmggYR1jBmT915gLZjLUbF+1jXmBsYvbF2MnBwSAiYS PyedYoawxSQu3FsPFhcSWMQo8eRqNYT9m1FiwW59EJtNQE3iy5fD7F2MHBwiAqoS007bdzFy cTALLGOUeDV9CxNEva3E3GsPGEFsTgE7iYXv29hBbGEBG4mZf3aC9bIA9XZ+iwQJ8wKVN319 ygJhC0r8mHwPzGYW0JJYv/M4E4QtL7F5zVtmkFYJAXWJR391IS4wkjj/UxGiQkRi34t3jBCP HGCV6D3kC2GbSjQ1bmGdwCgyC8mCWUgWzEKyYBaSUQsYWVYxiqYWJBcUJ6XnGukVJ+YWl+al 6yXn525iBKeMZ9I7GFc1WBxiFOBgVOLhVTjkFCzEmlhWXJl7iFGCg1lJhDfF2TlYiDclsbIq tSg/vqg0J7X4EGMy0PsTmaVEk/OB6SyvJN7Q2MTMyNLIzMLIxNycNGElcd6DrdaBQgLpiSWp 2ampBalFMFuYODilGhibZnaoVW+/ftckbLLLbTmVl93+9xyZgqXXnnj99sDmb4/ttz60OKWd +7rjdafy+qvbhbLKrmp9q9/1NP74ifom16ke3S7Czf/PMoZwntOqZb0Ze/FomJJC8OnlrrFb kqInFFYHBDG3CH2K0Vszyepp5y43bovWnqj7GlsOn7Dg5Nohwa8cd0mJpTgj0VCLuag4EQCw IRDrXQMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-Mailman-Approved-At: Tue, 08 Apr 2014 18:05:51 -0700 Cc: 'Jingoo Han' , 'Russell King' , 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.5 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 --- Changes since v1: - remove unnecessary error message, because devm_ioremap_resource() already prints one in all failure cases. 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 5831e41..0bcce78 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -1038,11 +1038,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) {