[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@lists.freedesktop.org
CC: iommu@lists.linux-foundation.org
CC: linux-arm-kernel@lists.infradead.org
CC: linux-doc@vger.kernel.org
CC: linux-mips@linux-mips.org
CC: linux-watchdog@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 2/5] DRM: Armada: Use devm_ioremap_resource

[Tushar Behera]

While at it, propagate the error code.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
CC: dri-devel@lists.freedesktop.org
CC: Russell King <rmk+kernel@arm.linux.org.uk>
CC: David Airlie <airlied@linux.ie>
---
 drivers/gpu/drm/armada/armada_crtc.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index d8e3982..2b6e7b7 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1037,11 +1037,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num,
 	if (ret)
 		return ret;
 
-	base = devm_request_and_ioremap(dev->dev, res);
-	if (!base) {
-		DRM_ERROR("failed to ioremap register\n");
-		return -ENOMEM;
-	}
+	base = devm_ioremap_resource(dev->dev, res);
+	if (IS_ERR(base))
+		return PTR_ERR(base);
 
 	dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
 	if (!dcrtc) {
-- 
1.7.9.5

Re: [PATCH 2/5] DRM: Armada: Use devm_ioremap_resource

[Russell King - ARM Linux]

On Thu, Oct 31, 2013 at 04:38:04PM +0530, Tushar Behera wrote:
> While at it, propagate the error code.
> 
> Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
> CC: dri-devel@lists.freedesktop.org
> CC: Russell King <rmk+kernel@arm.linux.org.uk>
> CC: David Airlie <airlied@linux.ie>
> ---
>  drivers/gpu/drm/armada/armada_crtc.c |    8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
> index d8e3982..2b6e7b7 100644
> --- a/drivers/gpu/drm/armada/armada_crtc.c
> +++ b/drivers/gpu/drm/armada/armada_crtc.c
> @@ -1037,11 +1037,9 @@ int armada_drm_crtc_create(struct drm_device *dev, unsigned num,
>  	if (ret)
>  		return ret;
>  
> -	base = devm_request_and_ioremap(dev->dev, res);
> -	if (!base) {
> -		DRM_ERROR("failed to ioremap register\n");
> -		return -ENOMEM;
> -	}
> +	base = devm_ioremap_resource(dev->dev, res);
> +	if (IS_ERR(base))
> +		return PTR_ERR(base);

David,

Do you want to take this directly, or shall I and send you another pull?
I have a few other minor patches for armada as well (implementing the
lastclose callback, and destroying the framebuffer associated with the
fb helper only after the fb helper has been finalised.

Thanks.