mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wolfram Sang <wsa@the-dreams.de>
To: linux-kernel@vger.kernel.org
Cc: Tushar Behera <tushar.behera@linaro.org>,
	Wolfram Sang <wsa@the-dreams.de>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	David Airlie <airlied@linux.ie>,
	dri-devel@lists.freedesktop.org
Subject: [PATCH 1/3] DRM: Armada: Use devm_ioremap_resource
Date: Thu, 19 Jun 2014 20:48:59 +0200	[thread overview]
Message-ID: <1403203741-5113-2-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1403203741-5113-1-git-send-email-wsa@the-dreams.de>

From: Tushar Behera <tushar.behera@linaro.org>

While at it, propagate the error code.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
 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 81c34f949dfc..3aedf9e993e6 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -1039,11 +1039,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) {
-- 
2.0.0


  reply	other threads:[~2014-06-19 18:50 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19 18:48 [PATCH 0/3] Remove devm_request_and_ioremap() Wolfram Sang
2014-06-19 18:48 ` Wolfram Sang [this message]
2014-06-19 18:49 ` [PATCH 2/3] bus: brcmstb_gisb: Use devm_ioremap_resource Wolfram Sang
2014-06-19 18:49 ` [PATCH 3/3] lib: devres: Remove deprecated devm_request_and_ioremap Wolfram Sang
2014-06-19 18:50 ` [PATCH 0/3] Remove devm_request_and_ioremap() Wolfram Sang
2014-06-20  2:36 ` Jingoo Han
2014-06-20  2:59   ` 'Greg Kroah-Hartman'
2014-06-20  6:47     ` Wolfram Sang
2014-06-20  8:45     ` Wolfram Sang
2014-06-20  8:51       ` Tushar Behera

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403203741-5113-2-git-send-email-wsa@the-dreams.de \
    --to=wsa@the-dreams.de \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=tushar.behera@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®