Skip to contentSkip to conversation

drm: armada: Use devm_ioremap_resource()

PATCH In review Fabio Estevam 2 participants 4 messages Feb 10, 2014 – Feb 24, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: armada: Use devm_ioremap_resource()

From: Fabio Estevam <[email protected]>

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

---
 drivers/gpu/drm/armada/armada_crtc.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +3 -5
index d8e3982..2b6e7b7 100644
@@ -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) {
Signature · 1 line
1.8.1.2
#1 lore raw

David,

Quoted 7 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

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

---

Any comments about this one?

Quoted 25 lines
 drivers/gpu/drm/armada/armada_crtc.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +3 -6
index d8e3982..2b6e7b7 100644
@@ -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

#2 lore raw
Quoted 5 lines · Fabio Estevam

David,

Quoted 2 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Quoted 7 lines
Quoted 5 lines

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

---

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.

Signature · 2 lines
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.
#3 lore raw
Quoted 8 lines · Russell King - ARM Linux

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.