From patchwork Mon Sep 2 01:28:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 2852639 Return-Path: X-Original-To: patchwork-linux-arm@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 4DDBA9F3DC for ; Mon, 2 Sep 2013 01:29:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5147720260 for ; Mon, 2 Sep 2013 01:29:36 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E97B72025A for ; Mon, 2 Sep 2013 01:29:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGIx6-0000yL-VS; Mon, 02 Sep 2013 01:29:13 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGIx4-0003lE-Tj; Mon, 02 Sep 2013 01:29:11 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VGIx0-0003kf-Td for linux-arm-kernel@lists.infradead.org; Mon, 02 Sep 2013 01:29:08 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSH00BMU5FN2G10@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 02 Sep 2013 10:28:40 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id E1.54.31253.8C9E3225; Mon, 02 Sep 2013 10:28:40 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-f8-5223e9c8dd1c Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 19.04.09055.8C9E3225; Mon, 02 Sep 2013 10:28:40 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSH003T85FR2M90@mmp1.samsung.com>; Mon, 02 Sep 2013 10:28:39 +0900 (KST) From: Jingoo Han To: 'Will Deacon' Subject: [PATCH] iommu/arm-smmu: use devm_ioremap_resource() instead of devm_request_and_ioremap() Date: Mon, 02 Sep 2013 10:28:39 +0900 Message-id: <005201cea77b$c0e14d90$42a3e8b0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac6ne8DMzF4xzBgdQSeJXpSlMQ/oLw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsVy+t8zfd0TL5WDDO6t4LK4vPASq0Xn7A3s FpseX2O1ePnxBIsDi8eTg/OYPNbMW8PosXlJvUffllWMASxRXDYpqTmZZalF+nYJXBnf+woK 3rBVdPRPZ2pgfMbaxcjJISFgIjF75z0oW0ziwr31bCC2kMAyRokle3hhaq5cOAYVX8Qo0dxm 2sXIBWT/YpRYu+UyWIJNQE3iy5fD7CC2iIC6xKa5L8CGMgsUSFxacQ6sRlggRWLTsv8sIDaL gKrE4bWvwGp4BWwlrn6bzwJhC0r8mHyPBaJXS2L9zuNMELa8xOY1b5m7GDmADlKXePRXF2KV nsTl08ugykUk9r14xwhym4TAOnaJvUses0LsEpD4NvkQC0SvrMSmA8wQf0lKHFxxg2UCo9gs JJtnIdk8C8nmWUhWLGBkWcUomlqQXFCclF5kolecmFtcmpeul5yfu4kREmETdjDeO2B9iDEZ aP1EZinR5HxghOaVxBsamxlZmJqYGhuZW5qRJqwkzqveYh0oJJCeWJKanZpakFoUX1Sak1p8 iJGJg1OqgdFS5n2G6Ks5K1cx+8tO6jo668aTY8rGSf1Pjx3mFNrWznhr+lYOr5WbsutuzPQs sFGvjQ/oPbhrbTDz7LSI0m1nzFkOSpYWP5J7fUspe36B8dbISXH84S2lFl9FNnwuWrg19R9f 8XQT25CqAxE7J6+6tNSh+vHXN/+mlUrIi3QZXd47KWZe4CwlluKMREMt5qLiRAB4uApFxgIA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIKsWRmVeSWpSXmKPExsVy+t9jAd0TL5WDDHZfYbO4vPASq0Xn7A3s FpseX2O1ePnxBIsDi8eTg/OYPNbMW8PosXlJvUffllWMASxRDYw2GamJKalFCql5yfkpmXnp tkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUA7lRTKEnNKgUIBicXFSvp2mCaEhrjp WsA0Ruj6hgTB9RgZoIGEdYwZ3/sKCt6wVXT0T2dqYHzG2sXIySEhYCJx5cIxNghbTOLCvfVg tpDAIkaJ5jbTLkYuIPsXo8TaLZfBEmwCahJfvhxmB7FFBNQlNs19ATaIWaBA4tKKc2A1wgIp EpuW/WcBsVkEVCUOr30FVsMrYCtx9dt8FghbUOLH5HssEL1aEut3HmeCsOUlNq95y9zFyAF0 kLrEo7+6EKv0JC6fXgZVLiKx78U7xgmMArOQTJqFZNIsJJNmIWlZwMiyilE0tSC5oDgpPddQ rzgxt7g0L10vOT93EyM4gp9J7WBc2WBxiFGAg1GJh7dihXKQEGtiWXFl7iFGCQ5mJRHequdA Id6UxMqq1KL8+KLSnNTiQ4zJQI9OZJYSTc4HJpe8knhDYxMzI0sjMwsjE3Nz0oSVxHkPtFoH CgmkJ5akZqemFqQWwWxh4uCUamC0bkmzb9qfYuSwPFywx7HRUyjrhJ/IvcvSn1Se+uoUzey3 j6orEFg9OerRkmNJ96v+hDQLakXECrEHr9sl0jB7WsqSWO7IuOhVH24Z/+53Osu37E6W/Mb8 lfqZUpn+bjd05p401XsazTBNLe4Sh3Pgj5ne9/9cZdJ4FXHQb9e84jTFi+cuLVRiKc5INNRi LipOBAB9C8cjJAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130901_212907_199959_F48C26CC X-CRM114-Status: UNSURE ( 8.87 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -9.3 (---------) Cc: 'Joerg Roedel' , 'Jingoo Han' , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-6.6 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/iommu/arm-smmu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index f417e89..31c709c 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1786,9 +1786,9 @@ static int arm_smmu_device_dt_probe(struct platform_device *pdev) } smmu->size = resource_size(res); - smmu->base = devm_request_and_ioremap(dev, res); - if (!smmu->base) - return -EADDRNOTAVAIL; + smmu->base = devm_ioremap_resource(dev, res); + if (IS_ERR(smmu->base)) + return PTR_ERR(smmu->base); if (of_property_read_u32(dev->of_node, "#global-interrupts", &smmu->num_global_irqs)) {