From mboxrd@z Thu Jan 1 00:00:00 1970 From: yongd Subject: [PATCH 3/3] mmc: remove MMC_CAP_NEEDS_POLL setting in sdhci_add_host Date: Fri, 28 Sep 2012 18:28:33 +0800 Message-ID: <1348828113-19668-4-git-send-email-yongd@marvell.com> References: <1348828113-19668-1-git-send-email-yongd@marvell.com> Return-path: Received: from na3sys009aog124.obsmtp.com ([74.125.149.151]:50148 "EHLO na3sys009aog124.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751340Ab2I1K3Q (ORCPT ); Fri, 28 Sep 2012 06:29:16 -0400 In-Reply-To: <1348828113-19668-1-git-send-email-yongd@marvell.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Chris Ball , Anton Vorontsov , Marek Szyprowski , Shawn Guo , Wolfram Sang , Daniel Drake , Sascha Hauer , Wilson Callan , Ben Dooks Cc: zhangfei.gao@marvell.com, kevin.liu@marvell.com, jlfu@marvell.com, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, yongd In the current code logic, sdhci_add_host() will enable the polling method (set MMC_CAP_NEEDS_POLL) for a removable card (MMC_CAP_ NONREMOVABLE is not set) whose host's internal card detection method is disabled for some reason (SDHCI_QUIRK_BROKEN_CARD_DETECTION is set). However, this is improper since we can have some other card detection methods besides host internal card detection and the polling method. For example, we might use an external GPIO pin's interrupt to detect a removable SD card, so we shall set SDHCI_QUIRK_BROKEN_CARD_DETECTION since we don't use the internal card detection, and not set MMC_CAP_ NONREMOVABLE since the SD card is physically removable. As a result, with the current code, the polling method will also be enabled. Apparently, this is redundant and not what we want. And the better one to decide whether we use polling or not should be the host driver itself. Actually, some host driver has already been like this. Eg, in drivers/mmc/host/Au1xmmc.c, polling will be enabled only after the board-specific card detection can't be set up successfully. Change-Id: I27774488a7b9191d7bc39699fd7d62ee21bbf157 Signed-off-by: yongd --- drivers/mmc/host/sdhci.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 0e15c79..900d5f4 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2840,10 +2840,6 @@ int sdhci_add_host(struct sdhci_host *host) if (caps[0] & SDHCI_CAN_DO_HISPD) mmc->caps |= MMC_CAP_SD_HIGHSPEED | MMC_CAP_MMC_HIGHSPEED; - if ((host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) && - !(host->mmc->caps & MMC_CAP_NONREMOVABLE)) - mmc->caps |= MMC_CAP_NEEDS_POLL; - /* If vqmmc regulator and no 1.8V signalling, then there's no UHS */ host->vqmmc = regulator_get(mmc_dev(mmc), "vqmmc"); if (IS_ERR(host->vqmmc)) { -- 1.7.9.5