From patchwork Tue Oct 8 10:42:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 3002811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id DFA24BF924 for ; Tue, 8 Oct 2013 10:44:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2072220176 for ; Tue, 8 Oct 2013 10:44:17 +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 D3879200DC for ; Tue, 8 Oct 2013 10:44:15 +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 1VTUla-0000kD-O7; Tue, 08 Oct 2013 10:43:50 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTUlT-0002kB-Ap; Tue, 08 Oct 2013 10:43:43 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VTUlO-0002hp-OS for linux-arm-kernel@lists.infradead.org; Tue, 08 Oct 2013 10:43:39 +0000 Received: by mail-pd0-f180.google.com with SMTP id y10so8409222pdj.25 for ; Tue, 08 Oct 2013 03:43:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lhshOsyM/vVi5l1z4H4q5U+fy/hbRGm7c4j3vrcDx0o=; b=m3ilkOzD0g3vlVDhcPoUoooVFVU3kM3UqORFlX2w4TZTiylWJryNOmn8jJGIpl0MHT kM9nJ+grcHk87z0rXIX4U8Dp/aRqmHOAOj3RzzsWqtu5Ee3orRl++I4VDrGW4lvqSjOf A8oyTBhEVU9SiKHHsu0hVUI9gdI5biTeldlVvSbUKLChYM9ycNUUvRNvHEa3MZnWbcLj gMnDvNBQsawzYpitksk3Xhsc7ouIFrDtdnin2X0xkIHJkH7aFjXiN4YX6T/K7fyfa7LB Kfw6uEKnrntSjMKChHRQbSKks7jdo7TX4mXSgfwfXKBzydONSh8a3xq7ZwJTDY074xNB N+Ew== X-Gm-Message-State: ALoCoQl54/bxVL/a/BE998diuVyjQPds9pdBzc/rhHemoFPmMGQpTmPcL+xlgCmud1ZogocSIEuz X-Received: by 10.68.135.100 with SMTP id pr4mr1194224pbb.62.1381228997149; Tue, 08 Oct 2013 03:43:17 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id jj1sm39206565pbb.17.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Oct 2013 03:43:16 -0700 (PDT) From: Sachin Kamat To: iommu@lists.linux-foundation.org Subject: [PATCH 1/1] iommu: arm-smmu: Use devm_ioremap_resource Date: Tue, 8 Oct 2013 16:12:35 +0530 Message-Id: <1381228955-24313-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131008_064338_907706_0133E35A X-CRM114-Status: UNSURE ( 9.63 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: sachin.kamat@linaro.org, joro@8bytes.org, will.deacon@arm.com, 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 devm_request_and_ioremap is deprecated. Use devm_ioremap_resource instead. Signed-off-by: Sachin Kamat --- 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 181c9ba..b564930 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1787,9 +1787,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)) {