From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753523AbcA0FLv (ORCPT ); Wed, 27 Jan 2016 00:11:51 -0500 Received: from lucky1.263xmail.com ([211.157.147.131]:60718 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751473AbcA0FLs (ORCPT ); Wed, 27 Jan 2016 00:11:48 -0500 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: ulf.hansson@linaro.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <9af2a6c6f180bd4a99b71b40d7fe6793> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 From: Shawn Lin To: Ulf Hansson Cc: bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Lin , yangbo lu Subject: [RFC PATCH 06/21] mmc: sdhci-of-esdhc: consolidate parsing path Date: Wed, 27 Jan 2016 13:07:15 +0800 Message-Id: <1453871235-3535-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1453871155-3283-1-git-send-email-shawn.lin@rock-chips.com> References: <1453871155-3283-1-git-send-email-shawn.lin@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch remove mmc_of_parse and check return value of sdhci_get_of_property. Cc: yangbo lu Signed-off-by: Shawn Lin --- drivers/mmc/host/sdhci-of-esdhc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 83b1226..7fc0edc 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c @@ -600,7 +600,9 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) esdhc_init(pdev, host); - sdhci_get_of_property(pdev); + ret = sdhci_get_of_property(pdev); + if (ret) + goto err; pltfm_host = sdhci_priv(host); esdhc = pltfm_host->priv; @@ -629,11 +631,6 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) host->quirks2 |= SDHCI_QUIRK2_BROKEN_HOST_CONTROL; } - /* call to generic mmc_of_parse to support additional capabilities */ - ret = mmc_of_parse(host->mmc); - if (ret) - goto err; - mmc_of_parse_voltage(np, &host->ocr_mask); ret = sdhci_add_host(host); -- 2.3.7