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

Russell King - ARM Linux linux at arm.linux.org.uk
Thu Oct 31 16:12:33 CET 2013


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 at linaro.org>
> CC: dri-devel at lists.freedesktop.org
> CC: Russell King <rmk+kernel at arm.linux.org.uk>
> CC: David Airlie <airlied at 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.


More information about the dri-devel mailing list