From patchwork Mon Jun 10 11:35:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 2697221 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DB533DF264 for ; Mon, 10 Jun 2013 11:54:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753365Ab3FJLx6 (ORCPT ); Mon, 10 Jun 2013 07:53:58 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:41192 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753403Ab3FJLt6 (ORCPT ); Mon, 10 Jun 2013 07:49:58 -0400 Received: by mail-pd0-f173.google.com with SMTP id v14so3439295pde.4 for ; Mon, 10 Jun 2013 04:49:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=bhT+ZOmDH10zmARShRkfvcD3HsBmAhSzrCLzNQDv0zs=; b=hdjuGKq9e1essX6V4eVdIz7bRtaSNAEeBwZNQZWrsJi5tTj22EGWMu4IQGaCbE4vx8 SgnaxXW7PoxNR9sEwmiXKTHfLEYk1Vnqt1RPEls/lxC6FVbvwCXotqmdJDStnR6zb/9Q GSQeRxt3JpASyuT1eZWWN3CaISVzkz0WUE5bhJo4oKJp2cGSl9Oi8DAc0ycFLcfYL2hJ ia07zCvQEKj3c/tIQGh7oxFkSJBGowkFeezWhwIFLXZDs2aup6h8ljHKkRzj2rTb0G+C ZdqoCKsWTa4fJnXUVdaeAFUlwSoV8wEDxb7GhfNVsw3UGTY7qDtINeYx3ZkcNqA8biMO 1/Qw== X-Received: by 10.66.252.195 with SMTP id zu3mr13869073pac.185.1370864998406; Mon, 10 Jun 2013 04:49:58 -0700 (PDT) Received: from linaro.sisodomain.com ([115.113.119.130]) by mx.google.com with ESMTPSA id rn7sm10242037pbc.12.2013.06.10.04.49.55 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Jun 2013 04:49:57 -0700 (PDT) From: Tushar Behera To: linux-kernel@vger.kernel.org Cc: thierry.reding@gmail.com, patches@linaro.org, linux-mmc@vger.kernel.org, Chris Ball Subject: [PATCH 03/15] mmc: mvsdio: Convert to use devm_ioremap_resource Date: Mon, 10 Jun 2013 17:05:01 +0530 Message-Id: <1370864113-17895-4-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> References: <1370864113-17895-1-git-send-email-tushar.behera@linaro.org> X-Gm-Message-State: ALoCoQmc+QlEmMSEF12lkrtLHRrHQp+p2KyY9sNn95YzKxjS9room8a9p6ZN6XIiLCDA70ZlaWKb Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Commit 75096579c3ac ("lib: devres: Introduce devm_ioremap_resource()") introduced devm_ioremap_resource() and deprecated the use of devm_request_and_ioremap(). Signed-off-by: Tushar Behera CC: linux-mmc@vger.kernel.org CC: Chris Ball --- drivers/mmc/host/mvsdio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index d08fe6a..656f1f5 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -758,9 +758,9 @@ static int __init mvsd_probe(struct platform_device *pdev) spin_lock_init(&host->lock); - host->base = devm_request_and_ioremap(&pdev->dev, r); - if (!host->base) { - ret = -ENOMEM; + host->base = devm_ioremap_resource(&pdev->dev, r); + if (IS_ERR(host->base)) { + ret = PTR_ERR(host->base); goto out; }