Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754805Ab3JaLJp (ORCPT ); Thu, 31 Oct 2013 07:09:45 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:65012 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754775Ab3JaLJm (ORCPT ); Thu, 31 Oct 2013 07:09:42 -0400 From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: patches@linaro.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, Will Deacon , Joerg Roedel Subject: [PATCH 3/5] iommu/arm-smmu: Use devm_ioremap_resource Date: Thu, 31 Oct 2013 16:38:05 +0530 Message-Id: <1383217687-12037-4-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> References: <1383217687-12037-1-git-send-email-tushar.behera@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1184 Lines: 36 While at it, propagate the error code. Signed-off-by: Tushar Behera CC: linux-arm-kernel@lists.infradead.org CC: iommu@lists.linux-foundation.org CC: Will Deacon CC: Joerg Roedel --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/