[PATCH 2/2] mmc: some nip clean up for the sdhci driver
From: Roy Zang <hidden>
Date: 2010-08-10 10:03:46
Also in:
linux-mmc
Subsystem:
multimedia card (mmc), secure digital (sd) and sdio subsystem, secure digital host controller interface (sdhci) driver, the rest · Maintainers:
Ulf Hansson, Adrian Hunter, Linus Torvalds
remove the extra line and rewrite the if condition line. Signed-off-by: Roy Zang <redacted> --- drivers/mmc/host/sdhci-of-core.c | 1 - drivers/mmc/host/sdhci.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index d059805..732cffd 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c@@ -157,7 +157,6 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev, if (of_get_property(np, "sdhci,auto-cmd12", NULL)) host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12; - if (of_get_property(np, "sdhci,1-bit-only", NULL)) host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 4b7b2d5..a1e6269 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c@@ -818,10 +818,9 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host, mode = SDHCI_TRNS_BLK_CNT_EN; if (data->blocks > 1) { + mode |= SDHCI_TRNS_MULTI; if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_AUTO_CMD12) - mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_AUTO_CMD12; - else - mode |= SDHCI_TRNS_MULTI; + mode |= SDHCI_TRNS_AUTO_CMD12; } if (data->flags & MMC_DATA_READ) mode |= SDHCI_TRNS_READ;
--
1.5.6.5