From patchwork Mon Sep 17 18:16:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1469181 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 1A69CDF2D8 for ; Mon, 17 Sep 2012 17:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757117Ab2IQR4r (ORCPT ); Mon, 17 Sep 2012 13:56:47 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:20900 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757092Ab2IQR4q (ORCPT ); Mon, 17 Sep 2012 13:56:46 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAI00EXM9U9AKY0@mailout2.samsung.com>; Tue, 18 Sep 2012 02:56:45 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-19-5057645dfc13 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A8.08.03783.D5467505; Tue, 18 Sep 2012 02:56:45 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MAI00MTJ9U8PO50@mmp1.samsung.com>; Tue, 18 Sep 2012 02:56:45 +0900 (KST) From: Thomas Abraham To: linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Cc: will.newton@imgtec.com, cjb@laptop.org, grant.likely@secretlab.ca, rob.herring@calxeda.com, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, girish.shivananjappa@linaro.org, jh80.chung@samsung.com, tgih.jun@samsung.com, patches@linaro.org Subject: [PATCH v6 3/9] mmc: dw_mmc: allow probe to succeed even if one slot is initialized Date: Mon, 17 Sep 2012 23:46:37 +0530 Message-id: <1347905803-22742-4-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1347905803-22742-1-git-send-email-thomas.abraham@linaro.org> References: <1347905803-22742-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOJMWRmVeSWpSXmKPExsVy+t9jAd3YlPAAg4vTBCyO/O9ntJhxfh+T A5PH501yAYxRXDYpqTmZZalF+nYJXBnH/vIUHOKt2HzmN1sD412uLkZODgkBE4lz736zQNhi EhfurWfrYuTiEBJYxCjxYtJrZginjUni251nrCBVbAIGEo8WvmMHsUUEnCSWzJ0AVsQs0Mgk sXHhTjaQhLBArMTj1Q1MIDaLgKrE5MmfwBp4BTwl+k5PYIRYpySxofcoWA2ngJfE9O2HwGqE gGr2rpjNMoGRdwEjwypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2MYO8/k9rBuLLB4hCjAAej Eg9voEt4gBBrYllxZe4hRgkOZiUR3tsCQCHelMTKqtSi/Pii0pzU4kOM0hwsSuK8wp8CA4QE 0hNLUrNTUwtSi2CyTBycUg2Ms2w1u8yqBLmZY35u5t96ct+yCknN1mz3M7NDlu6v2xaR8rtk ypsMKwXLkwn+Onk+eksWNO38HlcwZ0eXYfCV9jMTJedWrXSw/PN4s9zJSZp+u8u/X+6e4j1h zZFb3wvKDoXpObSu/zz/QMyybYw7E+uzGpOzfok++vLIdOa5GXwn1z70nZAoqMRSnJFoqMVc VJwIAIABIO36AQAA Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Instead of aborting the probe in case a slot initialization fails, allow initialization of as many slots as possible. If there are atleast one instance of slot that is successfully initialized, allow the driver probe to succeed. Signed-off-by: Thomas Abraham Acked-by: Will Newton --- drivers/mmc/host/dw_mmc.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a18e73c..227c42e 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1946,6 +1946,7 @@ int dw_mci_probe(struct dw_mci *host) { int width, i, ret = 0; u32 fifo_size; + int init_slots = 0; if (!host->pdata || !host->pdata->init) { dev_err(host->dev, @@ -2054,10 +2055,18 @@ int dw_mci_probe(struct dw_mci *host) /* We need at least one slot to succeed */ for (i = 0; i < host->num_slots; i++) { ret = dw_mci_init_slot(host, i); - if (ret) { - ret = -ENODEV; - goto err_init_slot; - } + if (ret) + dev_dbg(host->dev, "slot %d init failed\n", i); + else + init_slots++; + } + + if (init_slots) { + dev_info(host->dev, "%d slots initialized\n", init_slots); + } else { + dev_dbg(host->dev, "attempted to initialize %d slots, " + "but failed on all\n", host->num_slots); + goto err_init_slot; } /* @@ -2092,12 +2101,6 @@ int dw_mci_probe(struct dw_mci *host) return 0; err_init_slot: - /* De-init any initialized slots */ - while (i > 0) { - if (host->slot[i]) - dw_mci_cleanup_slot(host->slot[i], i); - i--; - } free_irq(host->irq, host); err_workqueue: