aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/mmc.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2010-09-27 04:42:19 -0400
committerChris Ball <cjb@laptop.org>2010-10-23 09:11:15 -0400
commit71d7d3d190fe77588269a8febf93cd739bd91eb3 (patch)
tree32aa0d033c40c38327a704e2cad0fc61e2dd86ae /drivers/mmc/core/mmc.c
parentd3c502b84f734b36abdc9d11ec61f00016e98d33 (diff)
mmc: Add helper function to check if a card is removable
There are two checks that need to be made when determining whether a card is removable. A host controller may set MMC_CAP_NONREMOVABLE if the controller does not support removing cards (e.g. eMMC), in which case the card is physically non-removable. Also the 'mmc_assume_removable' module parameter can be configured at module load time, in which case the card may be logically non-removable. A helper function keeps the logic in one place so that code always checks both conditions. Because this new function is likely to be called from modules we now need to export the mmc_assume_removable symbol. Signed-off-by: Matt Fleming <matt@console-pimps.org> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Tested-by: Jaehoon Chung <jh80.chung@samsung.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc/core/mmc.c')
-rw-r--r--drivers/mmc/core/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6909a54c39b..6570c03f9c7 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -685,7 +685,7 @@ static void mmc_attach_bus_ops(struct mmc_host *host)
685{ 685{
686 const struct mmc_bus_ops *bus_ops; 686 const struct mmc_bus_ops *bus_ops;
687 687
688 if (host->caps & MMC_CAP_NONREMOVABLE || !mmc_assume_removable) 688 if (!mmc_card_is_removable(host))
689 bus_ops = &mmc_ops_unsafe; 689 bus_ops = &mmc_ops_unsafe;
690 else 690 else
691 bus_ops = &mmc_ops; 691 bus_ops = &mmc_ops;