From patchwork Sat May 9 12:57:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 6369411 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 129B29F32E for ; Sat, 9 May 2015 12:57:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25B44202EC for ; Sat, 9 May 2015 12:57:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E29802021A for ; Sat, 9 May 2015 12:57:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751066AbbEIM5e (ORCPT ); Sat, 9 May 2015 08:57:34 -0400 Received: from mail-yk0-f171.google.com ([209.85.160.171]:33393 "EHLO mail-yk0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbbEIM5d (ORCPT ); Sat, 9 May 2015 08:57:33 -0400 Received: by ykeo186 with SMTP id o186so26944848yke.0 for ; Sat, 09 May 2015 05:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=AwHqYR3Kgr8XUaPSBJ++zVRzWeAZrJ1dVpBdajSLguk=; b=rfXnT2TtKDB5aqb2T+rJqqBiGXQBMai/gNyH5+frJ2kFQt1YbROiQU4dXEPjqFM0vG boeom28FINcUH0VugZtSKmKvJNff0cf6g9te0KOj4b0lTTF02ZElWNO79MaE92Vh1Qva uCOl9RO+oyVLaddk3/8dIbTWb7hpxxbrmAOuXyjs1sSl32SXwF8uSdiHZSU/yNnigTHE ewsl+Plinwq2gVkb0kqHlAIj4slN4ah1PoYeYc1NgiDn2nsEbm3M/tLmD496zqEktWpm VpXUS2H68WP/De8SrF2F+IowiPvw5M5boXbZ/CdLdbjIIlZHWfJ+sQu5AlKHOrVybpuP Gw1A== X-Received: by 10.170.208.213 with SMTP id z204mr2732445yke.106.1431176253019; Sat, 09 May 2015 05:57:33 -0700 (PDT) Received: from localhost.localdomain ([187.64.235.17]) by mx.google.com with ESMTPSA id o67sm7044929yha.41.2015.05.09.05.57.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 09 May 2015 05:57:31 -0700 (PDT) From: Fabio Estevam To: ulf.hansson@linaro.org Cc: shawn.guo@linaro.org, kernel@pengutronix.de, linux-mmc@vger.kernel.org, Fabio Estevam Subject: [PATCH v2 1/2] mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe Date: Sat, 9 May 2015 09:57:08 -0300 Message-Id: <1431176229-32708-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, 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 From: Fabio Estevam mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it suits only for the dt case. Signed-off-by: Fabio Estevam --- Changes since v1: - None drivers/mmc/host/sdhci-esdhc-imx.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index d7b0a39..a9980d7 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -896,7 +896,8 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev, mmc_of_parse_voltage(np, &host->ocr_mask); - return 0; + /* call to generic mmc_of_parse to support additional capabilities */ + return mmc_of_parse(host->mmc); } #else static inline int @@ -1041,11 +1042,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V; } - /* call to generic mmc_of_parse to support additional capabilities */ - err = mmc_of_parse(host->mmc); - if (err) - goto disable_clk; - err = sdhci_add_host(host); if (err) goto disable_clk;