summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDov Levenglick <dovl@codeaurora.org>2015-07-20 17:33:03 +0300
committerSubhash Jadavani <subhashj@codeaurora.org>2016-05-31 15:27:05 -0700
commit42dd0264d115e4b70a4a044679dd121689e422f0 (patch)
tree3d7262827f30da05d52ffeb3fb67713d03d9f420 /include/linux
parentd25b9c4733136c2f14d2fe2a1c130869e01f76a1 (diff)
mmc: core: change test of auto_bkops configured
Changing the test of whether auto_bkops is configured allows for a case where the host tried to configure auto_bkops yet the CMD6 failed in configuring the device. This allows a case where manual bkops is configured on a eMMC 5.1 device Change-Id: Ia6c411f516bf27b8a5865109dcf4b290eb3d8e46 Signed-off-by: Dov Levenglick <dovl@codeaurora.org> [subhashj@codeaurora.org: fixed trivial merge conflicts & fixed compilation error] Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mmc/card.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index ce2a0aa79425..b652076be866 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -665,12 +665,10 @@ static inline bool mmc_card_configured_manual_bkops(const struct mmc_card *c)
return c->ext_csd.man_bkops_en & EXT_CSD_BKOPS_MANUAL_EN;
}
-/*
- * By software design, auto_bkops will be enabled on the device if it supports
- * it. Therefore, testing if a card is configured to run bkops is synonymous
- * to checking if it supports bkops
- */
-#define mmc_card_configured_auto_bkops(c) mmc_card_support_auto_bkops(c)
+static inline bool mmc_card_configured_auto_bkops(const struct mmc_card *c)
+{
+ return c->ext_csd.man_bkops_en & EXT_CSD_BKOPS_AUTO_EN;
+}
#define mmc_card_name(c) ((c)->cid.prod_name)
#define mmc_card_id(c) (dev_name(&(c)->dev))