]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
mmc: rename mmc_can_sanitize() to mmc_card_can_sanitize()
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 1 Apr 2025 09:58:42 +0000 (11:58 +0200)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 14 May 2025 14:59:17 +0000 (16:59 +0200)
mmc_can_* functions sometimes relate to the card and sometimes to the host.
Make it obvious by renaming this function to include 'card'. Also, convert to
proper bool type while we are here.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250401095847.29271-7-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/core.c
drivers/mmc/core/core.h
drivers/mmc/core/mmc_ops.c

index e7449d03f311f632d0f76e4c5873e5eed8a51455..ff75336eb1aee7fb1048b0bf28dbbc90e001206e 100644 (file)
@@ -1862,13 +1862,13 @@ bool mmc_card_can_discard(struct mmc_card *card)
 }
 EXPORT_SYMBOL(mmc_card_can_discard);
 
-int mmc_can_sanitize(struct mmc_card *card)
+bool mmc_card_can_sanitize(struct mmc_card *card)
 {
        if (!mmc_can_trim(card) && !mmc_card_can_erase(card))
-               return 0;
+               return false;
        if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE)
-               return 1;
-       return 0;
+               return true;
+       return false;
 }
 
 int mmc_can_secure_erase_trim(struct mmc_card *card)
index 2e66d832162661a150b4bc4a9ba3f247f6151e6b..1f194665499d0f37f223788e5d464c2154416dee 100644 (file)
@@ -121,7 +121,7 @@ int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr, unsigned in
 bool mmc_card_can_erase(struct mmc_card *card);
 int mmc_can_trim(struct mmc_card *card);
 bool mmc_card_can_discard(struct mmc_card *card);
-int mmc_can_sanitize(struct mmc_card *card);
+bool mmc_card_can_sanitize(struct mmc_card *card);
 int mmc_can_secure_erase_trim(struct mmc_card *card);
 int mmc_erase_group_aligned(struct mmc_card *card, sector_t from, unsigned int nr);
 unsigned int mmc_calc_max_discard(struct mmc_card *card);
index 638e87a861bc6d9e343b7241d03390947baf4a12..66283825513cb4ff993a1b2ec1f0b0cac4e74487 100644 (file)
@@ -1046,7 +1046,7 @@ int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms)
        struct mmc_host *host = card->host;
        int err;
 
-       if (!mmc_can_sanitize(card)) {
+       if (!mmc_card_can_sanitize(card)) {
                pr_warn("%s: Sanitize not supported\n", mmc_hostname(host));
                return -EOPNOTSUPP;
        }