[PATCH] DRM: Armada: Use devm_ioremap_resource()

[PATCH] DRM: Armada: Use devm_ioremap_resource()

[Jingoo Han]

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
 drivers/gpu/drm/armada/armada_crtc.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index d8e3982..23b0123 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1037,10 +1037,10 @@ 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) {
+	base = devm_ioremap_resource(dev->dev, res);
+	if (IS_ERR(base)) {
 		DRM_ERROR("failed to ioremap register\n");
-		return -ENOMEM;
+		return PTR_ERR(base);
 	}
 
 	dcrtc = kzalloc(sizeof(*dcrtc), GFP_KERNEL);
-- 
1.7.10.4

Re: [PATCH] DRM: Armada: Use devm_ioremap_resource()

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 1082 bytes --]

On Thu, Apr 03, 2014 at 09:31:04AM +0900, Jingoo Han wrote:
> Use devm_ioremap_resource() because devm_request_and_ioremap() is
> obsoleted by devm_ioremap_resource().
> 
> Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> ---
>  drivers/gpu/drm/armada/armada_crtc.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
> index d8e3982..23b0123 100644
> --- a/drivers/gpu/drm/armada/armada_crtc.c
> +++ b/drivers/gpu/drm/armada/armada_crtc.c
> @@ -1037,10 +1037,10 @@ 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) {
> +	base = devm_ioremap_resource(dev->dev, res);
> +	if (IS_ERR(base)) {
>  		DRM_ERROR("failed to ioremap register\n");
> -		return -ENOMEM;
> +		return PTR_ERR(base);

While at it, perhaps you should drop the error message too because
devm_ioremap_resource() already prints one in all failure cases.

Thierry

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] DRM: Armada: Use devm_ioremap_resource()

[Jingoo Han]

On Monday, April 07, 2014 7:53 PM, Thierry Reding wrote:
> On Thu, Apr 03, 2014 at 09:31:04AM +0900, Jingoo Han wrote:
> > Use devm_ioremap_resource() because devm_request_and_ioremap() is
> > obsoleted by devm_ioremap_resource().
> >
> > Signed-off-by: Jingoo Han <jg1.han@samsung.com>
> > ---
> >  drivers/gpu/drm/armada/armada_crtc.c |    6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
> > index d8e3982..23b0123 100644
> > --- a/drivers/gpu/drm/armada/armada_crtc.c
> > +++ b/drivers/gpu/drm/armada/armada_crtc.c
> > @@ -1037,10 +1037,10 @@ 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) {
> > +	base = devm_ioremap_resource(dev->dev, res);
> > +	if (IS_ERR(base)) {
> >  		DRM_ERROR("failed to ioremap register\n");
> > -		return -ENOMEM;
> > +		return PTR_ERR(base);
> 
> While at it, perhaps you should drop the error message too because
> devm_ioremap_resource() already prints one in all failure cases.

Oh, right! It is my mistake. I will remove the error message.
Thank you for your comment.

Best regards,
Jingoo Han

[PATCH V2] DRM: Armada: Use devm_ioremap_resource()

[Jingoo Han]

Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
Changes since v1:
- remove unnecessary error message, because devm_ioremap_resource()
  already prints one in all failure cases.

 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 5831e41..0bcce78 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1038,11 +1038,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.10.4

[PATCH] drm: armada: Use devm_ioremap_resource()

[Fabio Estevam]

From: Fabio Estevam <fabio.estevam@freescale.com>

devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() 
instead.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 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.8.1.2

Re: [PATCH] drm: armada: Use devm_ioremap_resource()

[Fabio Estevam]

David,

On Mon, Feb 10, 2014 at 7:57 PM, Fabio Estevam <festevam@gmail.com> wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
>
> devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource()
> instead.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Any comments about this one?


>  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.8.1.2
>

Re: [PATCH] drm: armada: Use devm_ioremap_resource()

[Russell King - ARM Linux]

On Mon, Feb 24, 2014 at 10:56:31AM -0300, Fabio Estevam wrote:
> David,
> 
> On Mon, Feb 10, 2014 at 7:57 PM, Fabio Estevam <festevam@gmail.com> wrote:
> > From: Fabio Estevam <fabio.estevam@freescale.com>
> >
> > devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource()
> > instead.
> >
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > ---
> 
> Any comments about this one?

Given the amount of patches I'm presently dealing with, I really don't
want to bother with such trivial patches at the moment.  What I do want
to do is to get stuff like imx-drm and the conversion of armada to the
component helpers out the door and queued up for 3.15 as a higher
priority than to bother with trivial stuff like this which has the
possibility to break those patches.

Let's see about dealing with this post 3.14.

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

Re: [PATCH] drm: armada: Use devm_ioremap_resource()

[Fabio Estevam]

On Mon, Feb 24, 2014 at 11:05 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:

> Given the amount of patches I'm presently dealing with, I really don't
> want to bother with such trivial patches at the moment.  What I do want
> to do is to get stuff like imx-drm and the conversion of armada to the
> component helpers out the door and queued up for 3.15 as a higher
> priority than to bother with trivial stuff like this which has the
> possibility to break those patches.
>
> Let's see about dealing with this post 3.14.

Understood, thanks.