[PATCH 0/5] Remove remaining instances of devm_request_and_ioremap

[PATCH 0/5] Remove remaining instances of devm_request_and_ioremap

[Tushar Behera]

devm_request_and_ioremap is now obsolete and is replaced by
devm_ioremap_resource. Update the remaining places where
devm_request_and_ioremap is still used and remove its definition.

The patches are based on next-20131030.

Tushar Behera (5):
  MIPS: ralink: Use devm_ioremap_resource
  DRM: Armada: Use devm_ioremap_resource
  iommu/arm-smmu: Use devm_ioremap_resource
  watchdog: ralink: Use devm_ioremap_resource
  lib: devres: Remove deprecated devm_request_and_ioremap

 Documentation/driver-model/devres.txt |    1 -
 arch/mips/ralink/timer.c              |    2 +-
 drivers/gpu/drm/armada/armada_crtc.c  |    8 +++-----
 drivers/iommu/arm-smmu.c              |    6 +++---
 drivers/watchdog/rt2880_wdt.c         |    2 +-
 include/linux/device.h                |    2 --
 lib/devres.c                          |   28 ----------------------------
 7 files changed, 8 insertions(+), 41 deletions(-)

CC: dri-devel at lists.freedesktop.org
CC: iommu at lists.linux-foundation.org
CC: linux-arm-kernel at lists.infradead.org
CC: linux-doc at vger.kernel.org
CC: linux-mips at linux-mips.org
CC: linux-watchdog at vger.kernel.org
CC: David Airlie <airlied@linux.ie>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Joerg Roedel <joro@8bytes.org>
CC: John Crispin <blogic@openwrt.org>
CC: Ralf Baechle <ralf@linux-mips.org>
CC: Rob Landley <rob@landley.net>
CC: Russell King <rmk+kernel@arm.linux.org.uk>
CC: Will Deacon <will.deacon@arm.com>
CC: Wim Van Sebroeck <wim@iguana.be>

-- 
1.7.9.5

[PATCH 3/5] iommu/arm-smmu: Use devm_ioremap_resource

[Tushar Behera]

While at it, propagate the error code.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: linux-arm-kernel at lists.infradead.org
CC: iommu at 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

[PATCH 3/5] iommu/arm-smmu: Use devm_ioremap_resource

[Will Deacon]

On Thu, Oct 31, 2013 at 11:08:05AM +0000, Tushar Behera wrote:
> While at it, propagate the error code.

Thanks, but I already have an equivalent patch queued which Joerg is going
to pull real soon now (right, Joerg? :p).

Will