From patchwork Thu Apr 14 02:29:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 8830511 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 85583C0553 for ; Thu, 14 Apr 2016 02:29:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A86262017E for ; Thu, 14 Apr 2016 02:29:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C217920295 for ; Thu, 14 Apr 2016 02:29:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753619AbcDNC3c (ORCPT ); Wed, 13 Apr 2016 22:29:32 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:40505 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752095AbcDNC33 (ORCPT ); Wed, 13 Apr 2016 22:29:29 -0400 Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-07.nifty.com with ESMTP id u3E2Sr3h010961; Thu, 14 Apr 2016 11:28:58 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com u3E2Sr3h010961 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1460600939; bh=zxLwkdHS4F/AmBq3XvCacS6DcdEK4/Hplu9BVWVumyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vDqbZXrfvcj207FFIdQ/NevCFDWPoaEAWYUu/CiRcQpoo7DVkZMhKcyLCntxPaYtK Z1oIOSS9TUc2Z2Zj7PnfaHqbU07D7Qo+jvLzh3pPWOBJ5ZhH4qhm/ta5VmeiCTsT6j F4Qh/MxcUC5OjjA9/aTBlvmT92Ra5Q160a9pI6RQykML01KPvc6lw2jNuYk1RvS4uY sah50E1MJghymUnDTGPfF1Z3/nMF6oUeUwudeboAvzhHBfe8gBcycR6LBL4d/o+Ho4 4Ay9oufIUhm6FQgvOa6wPixQSodK+zZghsGduRcb2PXH+aBry92fQwZrNrVjVFol4q 3aIFX+ZjQLU6w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mmc@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org, Adrian Hunter , Ulf Hansson Subject: [PATCH 6/7] mmc: sdhci-pltfm: move devm_ioremap_resource() up Date: Thu, 14 Apr 2016 11:29:49 +0900 Message-Id: <1460600990-10993-7-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460600990-10993-1-git-send-email-yamada.masahiro@socionext.com> References: <1460600990-10993-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Call devm_ioremap_resource() right after platform_get_resource(). This saves the error check of platform_get_resource() because devm_ioremap_resource() checks if the given resource is NULL. Signed-off-by: Masahiro Yamada --- drivers/mmc/host/sdhci-pltfm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c index 94955e1..870c3d7 100644 --- a/drivers/mmc/host/sdhci-pltfm.c +++ b/drivers/mmc/host/sdhci-pltfm.c @@ -119,11 +119,13 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, { struct sdhci_host *host; struct resource *iomem; + void __iomem *ioaddr; int ret; iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!iomem) { - ret = -ENOMEM; + ioaddr = devm_ioremap_resource(&pdev->dev, iomem); + if (IS_ERR(ioaddr)) { + ret = PTR_ERR(ioaddr); goto err; } @@ -141,6 +143,7 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, goto err; } + host->ioaddr = ioaddr; host->hw_name = dev_name(&pdev->dev); if (pdata && pdata->ops) host->ops = pdata->ops; @@ -158,12 +161,6 @@ struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev, goto err_request; } - host->ioaddr = devm_ioremap_resource(&pdev->dev, iomem); - if (IS_ERR(host->ioaddr)) { - ret = PTR_ERR(host->ioaddr); - goto err_request; - } - /* * Some platforms need to probe the controller to be able to * determine which caps should be used.