From patchwork Fri May 8 05:56: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: 6362531 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 ED83F9F373 for ; Fri, 8 May 2015 05:59:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2EE31203A9 for ; Fri, 8 May 2015 05:59:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 400AA2039E for ; Fri, 8 May 2015 05:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbbEHF7X (ORCPT ); Fri, 8 May 2015 01:59:23 -0400 Received: from mail-yk0-f182.google.com ([209.85.160.182]:35517 "EHLO mail-yk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751732AbbEHF7X (ORCPT ); Fri, 8 May 2015 01:59:23 -0400 Received: by ykec202 with SMTP id c202so17667074yke.2 for ; Thu, 07 May 2015 22:59:22 -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=yjWAK9KJG9Z782PpHKzV/szrX28m0stWbdtQxb6AzTY=; b=l6uc7PVig0+FRL0hCd57gh+3eL60WRWE1Y9GQnXPzLhxh1cidbCqVtdmr+T7u6mK7M Qeye5U845vAKUF+yfuR8HQJ8b1lzCTvlRcfxPLpYoMc7xis9ghtl3LD9NZ4/jNdsjt/W BtXoM+CYZN8PDlHYjHeYKkWvGGdNEGV89Qw0WI71rr09500SsOwMFM2vcPITFUoKHy69 IyR1b5gqG8BqfxFBaXx1RyP6lsxua6YAC2RvCd3AHnOaarJshsykYAYLq/M4qo5Wml2x 9J65GqoFWPlKjrTxTvLKA/zwJdM2jATQo1FBAeRS258W2WstgKeE4XdkavgneMLe5kgc jAHQ== X-Received: by 10.236.69.161 with SMTP id n21mr1932863yhd.103.1431064762544; Thu, 07 May 2015 22:59:22 -0700 (PDT) Received: from localhost.localdomain ([187.64.235.17]) by mx.google.com with ESMTPSA id s27sm3743401yho.9.2015.05.07.22.59.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 May 2015 22:59:21 -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 1/2] mmc: sdhci-esdhc-imx: Move mmc_of_parse() to the dt probe Date: Fri, 8 May 2015 02:56:08 -0300 Message-Id: <1431064569-5947-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 --- 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;