drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function

PATCH In review [email protected] 1 participant 1 message Aug 19, 2010

Subsystems (3)

MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Secure digital host controller interface (SDHCI) Samsung driver

lore

Share & tools

lore

[email protected]

author

2010-08-19 21:13 UTC #0 lore raw

PATCH 14/20 drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect function

From: Kyungmin Park <[email protected]>

There's some merge problem between sdhic core and sdhci-s3c host. After mutex is changed to spinlock. It needs to use use spin lock functions and use the correct card detection function.

Signed-off-by Kyungmin Park <[email protected]>

Cc <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/mmc/host/sdhci-s3c.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/mmc/host/sdhci-s3c.c renamed from drivers/mmc/host/sdhci-s3c.c~drivers-mmc-host-sdhci-s3cc-use-the-correct-mutex-and-card-detect-function +3 -3

diff -puN drivers/mmc/host/sdhci-s3c.c~drivers-mmc-host-sdhci-s3cc-use-the-correct-mutex-and-card-detect-function drivers/mmc/host/sdhci-s3c.c
@@ -242,7 +242,7 @@ static void sdhci_s3c_notify_change(stru
 {
 	struct sdhci_host *host = platform_get_drvdata(dev);
 	if (host) {
-		mutex_lock(&host->lock);
+		spin_lock(&host->lock);
 		if (state) {
 			dev_dbg(&dev->dev, "card inserted.\n");
 			host->flags &= ~SDHCI_DEVICE_DEAD;

@@ -252,8 +252,8 @@ static void sdhci_s3c_notify_change(stru
 			host->flags |= SDHCI_DEVICE_DEAD;
 			host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
 		}
-		sdhci_card_detect(host);
-		mutex_unlock(&host->lock);
+		tasklet_schedule(&host->card_tasklet);
+		spin_unlock(&host->lock);
 	}
 }