From patchwork Mon Sep 2 01:31:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 2852640 Return-Path: X-Original-To: patchwork-linux-mmc@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 565479F3DC for ; Mon, 2 Sep 2013 01:31:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 884A720260 for ; Mon, 2 Sep 2013 01:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA80D2025A for ; Mon, 2 Sep 2013 01:31:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753233Ab3IBBbj (ORCPT ); Sun, 1 Sep 2013 21:31:39 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:36808 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366Ab3IBBbi (ORCPT ); Sun, 1 Sep 2013 21:31:38 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSH008FD5K6ANE0@mailout3.samsung.com> for linux-mmc@vger.kernel.org; Mon, 02 Sep 2013 10:31:28 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.48]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 59.A5.31253.07AE3225; Mon, 02 Sep 2013 10:31:28 +0900 (KST) X-AuditID: cbfee690-b7f3b6d000007a15-df-5223ea7089d5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 41.94.09055.07AE3225; Mon, 02 Sep 2013 10:31:28 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSH0017Z5KGL9B0@mmp1.samsung.com>; Mon, 02 Sep 2013 10:31:28 +0900 (KST) From: Jingoo Han To: 'Chris Ball' Cc: linux-mmc@vger.kernel.org, 'Nicolas Pitre' , 'Thomas Petazzoni' , 'Simon Baatz' , 'Jingoo Han' Subject: [PATCH] mmc: mvsdio: use devm_ioremap_resource() instead of devm_request_and_ioremap() Date: Mon, 02 Sep 2013 10:31:28 +0900 Message-id: <005301cea77c$255f50f0$701df2d0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac6nfCU/NGQcxqGsQlubE6JrCOyHxw== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrFIsWRmVeSWpSXmKPExsVy+t8zA92CV8pBBkcW6Vtsf72RzeLkrm2s FpcXXmK1OPK/n9Fi3osXbBZPHzQxObB5PDvRzubxZNNFRo+ds+6yexy6spbRo2/LKkaPz5vk AtiiuGxSUnMyy1KL9O0SuDJePN/DVDCDrWL/726mBsaprF2MnBwSAiYSq09/ZIawxSQu3FvP 1sXIxSEksIxRYuGmHkaYottHJzBDJBYxSvzf0c8GkhAS+MUoMf+IB4jNJqAm8eXLYXYQW0RA UWLL9+PsIA3MAseBGnYuYQFJCAskSjxa1Q5WxCKgKrH+7BOwM3gFbCX6pq2EsgUlfky+B1bP LKAlsX7ncSYIW15i85q3QFdwAF2kLvHory7ELj2JZdPWsUGUiEjse/GOEWSvhMAldonVjReY IHYJSHybfIgFoldWYtMBqI8lJQ6uuMEygVFsFpLNs5BsnoVk8ywkKxYwsqxiFE0tSC4oTkov MtErTswtLs1L10vOz93ECInHCTsY7x2wPsSYDLR+IrOUaHI+MJ7zSuINjc2MLExNTI2NzC3N SBNWEudVb7EOFBJITyxJzU5NLUgtii8qzUktPsTIxMEp1cDIeGZ9puHRRLtbGR9PKrDlCu/P 1OvR9+dSb1Bbmzjnz18nNy7Ody3x0Z8ObX3dKZnap5RSJbHtjuQ+m+RJZ/rurJmcJCn5d/0D hSd24gbW3IdCrq5eXix9K0doUUDzFPa91x5I+jJc5tDS1vjjFS9lue3ColslS6/s3cBaHTFv +jKRwJPG67YpsRRnJBpqMRcVJwIAWefapt0CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOKsWRmVeSWpSXmKPExsVy+t9jAd2CV8pBBvuXaFtsf72RzeLkrm2s FpcXXmK1OPK/n9Fi3osXbBZPHzQxObB5PDvRzubxZNNFRo+ds+6yexy6spbRo2/LKkaPz5vk AtiiGhhtMlITU1KLFFLzkvNTMvPSbZW8g+Od403NDAx1DS0tzJUU8hJzU22VXHwCdN0yc4Du UFIoS8wpBQoFJBYXK+nbYZoQGuKmawHTGKHrGxIE12NkgAYS1jFmvHi+h6lgBlvF/t/dTA2M U1m7GDk5JARMJG4fncAMYYtJXLi3nq2LkYtDSGARo8T/Hf1sIAkhgV+MEvOPeIDYbAJqEl++ HGYHsUUEFCW2fD/ODtLALHAcqGHnEhaQhLBAosSjVe1gRSwCqhLrzz4B28YrYCvRN20llC0o 8WPyPbB6ZgEtifU7jzNB2PISm9e8BbqIA+gidYlHf3UhdulJLJu2jg2iRERi34t3jBMYBWYh mTQLyaRZSCbNQtKygJFlFaNoakFyQXFSeq6hXnFibnFpXrpecn7uJkZwtD+T2sG4ssHiEKMA B6MSD2/FCuUgIdbEsuLK3EOMEhzMSiK8Vc+BQrwpiZVVqUX58UWlOanFhxiTgR6dyCwlmpwP TER5JfGGxiZmRpZGZhZGJubmpAkrifMeaLUOFBJITyxJzU5NLUgtgtnCxMEp1cBozSrOMuVE kYq3wM3/B7vPycz58rbmj8O582pJnNMfF4Yft2469i5ymnhU+3cBnRyWPTObnLy8vgtm2p6c 52inuuf071O+P+au7Arf9vChU8KkeUEdl2K7j++76+iwX6t1VoGhzeSWqnMpZ/aonms8U7Ht 6+OyiD3nHtaE7w46uu3tuWM8yRP+K7EUZyQaajEXFScCAONHJ506AwAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Use devm_ioremap_resource() because devm_request_and_ioremap() is obsoleted by devm_ioremap_resource(). Signed-off-by: Jingoo Han --- 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 06c5b0b..a592407 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c @@ -775,9 +775,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; }