From patchwork Mon Feb 10 21:57:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 3623871 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 416409F2D6 for ; Mon, 10 Feb 2014 21:58:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 78EE7201DE for ; Mon, 10 Feb 2014 21:58:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 91132201CD for ; Mon, 10 Feb 2014 21:58:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A2CADFA735; Mon, 10 Feb 2014 13:57:56 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yh0-f50.google.com (mail-yh0-f50.google.com [209.85.213.50]) by gabe.freedesktop.org (Postfix) with ESMTP id BBA94FA735 for ; Mon, 10 Feb 2014 13:57:54 -0800 (PST) Received: by mail-yh0-f50.google.com with SMTP id 29so5866364yhl.23 for ; Mon, 10 Feb 2014 13:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=MWKWqtSJEfqK+ovI6J6q91m9J7kUCpQPlhJZ46z+2IA=; b=jEYm7UnAuW50W13WiybLOsHpoiRJAtPK2zooKOQYctvXau3PwqjxT1iKYP3BnWPYae vGLNgMIIZmcky6kBMALa/Z8i0VirXfjfeSOGkKUlvgRS4hBGOwsVQ8rax6kRIeP032SL he1vFo5ymdEMPoVlBpuN1Ejqs3HQX+X98g+4zvrGBXnAgRxV2XSJ4rC7OQZ2sWAjt/U7 fmT+nBxPQTRnH8V7pO70cJbL7tdbsANZV1g28VXif+QwO9Lcb2QSMDiQDDp0DAGV+NaC b8kVwKd2D63Bu8S0/Sgc+pgb37Q11MZjO0cmTvihVIplF9tKvX1jMT0pkOTK1XoP87X8 1iLA== X-Received: by 10.236.87.1 with SMTP id x1mr19293333yhe.51.1392069471925; Mon, 10 Feb 2014 13:57:51 -0800 (PST) Received: from localhost.localdomain ([177.194.40.80]) by mx.google.com with ESMTPSA id k3sm50995319yhc.13.2014.02.10.13.57.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 13:57:50 -0800 (PST) From: Fabio Estevam To: airlied@linux.ie Subject: [PATCH] drm: armada: Use devm_ioremap_resource() Date: Mon, 10 Feb 2014 19:57:25 -0200 Message-Id: <1392069445-26509-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 Cc: Fabio Estevam , rmk+kernel@arm.linux.org.uk, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Fabio Estevam devm_request_and_ioremap() is deprecated, so use devm_ioremap_resource() instead. Signed-off-by: Fabio Estevam --- 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) {