summaryrefslogtreecommitdiffstats
path: root/include/linux/mmc
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-10-30 01:00:18 +0100
committerChris Ball <chris@printf.net>2014-02-13 22:58:15 -0500
commit2501c9179dff2add6aadd3898cd729e94e777d3a (patch)
tree5ec2c6fc9d62b21920b7319fbf14e22cad467f6b /include/linux/mmc
parent710dec95d579bf59c157358cc9cf7b42907d1c0f (diff)
downloadlinux-2501c9179dff2add6aadd3898cd729e94e777d3a.tar.gz
linux-2501c9179dff2add6aadd3898cd729e94e777d3a.tar.bz2
linux-2501c9179dff2add6aadd3898cd729e94e777d3a.zip
mmc: core: Use MMC_UNSAFE_RESUME as default behavior
Invoking system suspend or shutdown without using the Kconfig option MMC_UNSAFE_RESUME, did trigger an ungraceful power cut of the card. To improve the situation, change the behavior to always make use of the available bus_ops callbacks that handles system suspend and shutdown properly. By changing the behavior MMC_UNSAFE_RESUME becomes redundant, so lets's remove it. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'include/linux/mmc')
-rw-r--r--include/linux/mmc/host.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 99f5709ac343..2a139b2bdb9e 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -424,12 +424,9 @@ static inline int mmc_regulator_get_supply(struct mmc_host *mmc)
int mmc_pm_notify(struct notifier_block *notify_block, unsigned long, void *);
-/* Module parameter */
-extern bool mmc_assume_removable;
-
static inline int mmc_card_is_removable(struct mmc_host *host)
{
- return !(host->caps & MMC_CAP_NONREMOVABLE) && mmc_assume_removable;
+ return !(host->caps & MMC_CAP_NONREMOVABLE);
}
static inline int mmc_card_keep_power(struct mmc_host *host)