Return-Path: Received: from mail-yk0-f178.google.com ([209.85.160.178]:34116 "EHLO mail-yk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751292AbbIOEFF (ORCPT ); Tue, 15 Sep 2015 00:05:05 -0400 Received: by ykdg206 with SMTP id g206so173381093ykd.1 for ; Mon, 14 Sep 2015 21:05:04 -0700 (PDT) From: Fabio Estevam To: stable@vger.kernel.org Cc: ulf.hansson@linaro.org, aisheng.dong@freescale.com, shawnguo@kernel.org, kernel@pengutronix.de, Fabio Estevam Subject: [PATCH 1/7] mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe Date: Tue, 15 Sep 2015 01:04:46 -0300 Message-Id: <1442289892-32244-1-git-send-email-festevam@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Fabio Estevam commit 15064119273735c115fba381823b0746508bae3a upstream. mmc_of_parse() should be placed inside sdhci_esdhc_imx_probe_dt() as it suits only for the dt case. Cc: # 4.1 Signed-off-by: Fabio Estevam Signed-off-by: Ulf Hansson --- 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 82f512d..71ffa52 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -903,7 +903,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 @@ -1048,11 +1049,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; -- 1.9.1