From: Tushar Behera <tushar.behera@linaro.org>
To: linux-kernel@vger.kernel.org
Cc: patches@linaro.org, linux-arm-kernel@lists.infradead.org,
iommu@lists.linux-foundation.org,
Will Deacon <will.deacon@arm.com>, Joerg Roedel <joro@8bytes.org>
Subject: [PATCH 3/5] iommu/arm-smmu: Use devm_ioremap_resource
Date: Thu, 31 Oct 2013 16:38:05 +0530 [thread overview]
Message-ID: <1383217687-12037-4-git-send-email-tushar.behera@linaro.org> (raw)
In-Reply-To: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org>
While at it, propagate the error code.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: linux-arm-kernel@lists.infradead.org
CC: iommu@lists.linux-foundation.org
CC: Will Deacon <will.deacon@arm.com>
CC: Joerg Roedel <joro@8bytes.org>
---
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 2349d62..fe275b3 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1790,9 +1790,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)) {
--
1.7.9.5
next prev parent reply other threads:[~2013-10-31 11:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-31 11:08 [PATCH 0/5] Remove remaining instances of devm_request_and_ioremap Tushar Behera
2013-10-31 11:08 ` Tushar Behera [this message]
2013-10-31 15:59 ` [PATCH 3/5] iommu/arm-smmu: Use devm_ioremap_resource Will Deacon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383217687-12037-4-git-send-email-tushar.behera@linaro.org \
--to=tushar.behera@linaro.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@linaro.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).