mmc: core: Do not rescan non-removable devices

If MMC_CAP_NONREMOVABLE is set, only issue a detect job on init. Signed-off-by: Johan Rudholm <johan.rudholm@stericsson.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
git-mirror · Sep 4, 2012 · 3339d1e · 3339d1e
1 parent 36c179a
commit 3339d1e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
@@ -2053,6 +2053,11 @@ void mmc_rescan(struct work_struct *work)
 	if (host->rescan_disable)
 		return;
 
+	/* If there is a non-removable card registered, only scan once */
+	if ((host->caps & MMC_CAP_NONREMOVABLE) && host->rescan_entered)
+		return;
+	host->rescan_entered = 1;
+
 	mmc_bus_get(host);
 
 	/*

diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
@@ -300,6 +300,7 @@ struct mmc_host {
 #endif
 
 	int			rescan_disable;	/* disable card detection */
+	int			rescan_entered;	/* used with nonremovable devices */
 
 	struct mmc_card		*card;		/* device attached to this host */
-Original file line number
+Diff line change
@@ Expand Up / @@ -300,6 +300,7 @@ struct mmc_host { @@
     #endif
     	int			rescan_disable;	/* disable card detection */
+    	int			rescan_entered;	/* used with nonremovable devices */
     	struct mmc_card		*card;		/* device attached to this host */
@@ Expand Down @@