mmc: sdhci: Do not use spin lock in set_ios paths

The spin lock is not necessary in set_ios. Anything that is racing with
changes to the I/O state is already broken. The mmc core already provides
synchronization via "claiming" the host. So remove spin_lock and friends
from sdhci_set_ios and related callbacks.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Ludovic Desroches <ludovic.desroches@microchip.com>

1 files changed, 0 insertions, 9 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index e055bd3f5fe8..5c2b35dd1c45 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1361,9 +1361,7 @@ void sdhci_enable_clk(struct sdhci_host *host, u16 clk)
                         sdhci_dumpregs(host);
                         return;
                 }
-                spin_unlock_irq(&host->lock);
                 udelay(10);
-                spin_lock_irq(&host->lock);
         }
 
         clk |= SDHCI_CLOCK_CARD_EN;
@@ -1392,9 +1390,7 @@ static void sdhci_set_power_reg(struct sdhci_host *host, unsigned char mode,
 {
         struct mmc_host *mmc = host->mmc;
 
-        spin_unlock_irq(&host->lock);
         mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);
-        spin_lock_irq(&host->lock);
 
         if (mode != MMC_POWER_OFF)
                 sdhci_writeb(host, SDHCI_POWER_ON, SDHCI_POWER_CONTROL);
@@ -1574,16 +1570,12 @@ EXPORT_SYMBOL_GPL(sdhci_set_uhs_signaling);
 static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 {
         struct sdhci_host *host = mmc_priv(mmc);
-        unsigned long flags;
         u8 ctrl;
 
         if (ios->power_mode == MMC_POWER_UNDEFINED)
                 return;
 
-        spin_lock_irqsave(&host->lock, flags);
-
         if (host->flags & SDHCI_DEVICE_DEAD) {
-                spin_unlock_irqrestore(&host->lock, flags);
                 if (!IS_ERR(mmc->supply.vmmc) &&
                     ios->power_mode == MMC_POWER_OFF)
                         mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
@@ -1729,7 +1721,6 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 sdhci_do_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
 
         mmiowb();
-        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 static int sdhci_get_cd(struct mmc_host *mmc)