mmc: rename mmc_can_secure_erase_trim() to mmc_card_can_secure_erase_trim()

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-8-wsa+renesas@sang-engineering.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index e9213de4a9fe91c6e94fd95d46edbe7dad1c1f62..02a11a757360c08a8558e430add9690833f35644 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1276,7 +1276,7 @@ static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
        int err = 0, type = MMC_BLK_SECDISCARD;
        blk_status_t status = BLK_STS_OK;
 
-       if (!(mmc_can_secure_erase_trim(card))) {
+       if (!(mmc_card_can_secure_erase_trim(card))) {
                status = BLK_STS_NOTSUPP;
                goto out;
        }

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index ff75336eb1aee7fb1048b0bf28dbbc90e001206e..f451903891a1fc5ca8923874059b148177c118b6 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1871,14 +1871,12 @@ bool mmc_card_can_sanitize(struct mmc_card *card)
        return false;
 }
 
-int mmc_can_secure_erase_trim(struct mmc_card *card)
+bool mmc_card_can_secure_erase_trim(struct mmc_card *card)
 {
-       if ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN) &&
-           !(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN))
-               return 1;
-       return 0;
+       return ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN) &&
+               !(card->quirks & MMC_QUIRK_SEC_ERASE_TRIM_BROKEN));
 }
-EXPORT_SYMBOL(mmc_can_secure_erase_trim);
+EXPORT_SYMBOL(mmc_card_can_secure_erase_trim);
 
 int mmc_erase_group_aligned(struct mmc_card *card, sector_t from,
                            unsigned int nr)

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 1f194665499d0f37f223788e5d464c2154416dee..3f7bd25e95570dc9f42b6985a735c9dc8044ba08 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -122,7 +122,7 @@ 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);
 bool mmc_card_can_sanitize(struct mmc_card *card);
-int mmc_can_secure_erase_trim(struct mmc_card *card);
+bool mmc_card_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);
 

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 099fee86d08803375dc1f2a4b345dd034592ad0f..f65bf1717bbd4955020c78dd929fe687a476e36d 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -184,7 +184,7 @@ static void mmc_queue_setup_discard(struct mmc_card *card,
                return;
 
        lim->max_hw_discard_sectors = max_discard;
-       if (mmc_can_secure_erase_trim(card))
+       if (mmc_card_can_secure_erase_trim(card))
                lim->max_secure_erase_sectors = max_discard;
        if (mmc_can_trim(card) && card->erased_byte == 0)
                lim->max_write_zeroes_sectors = max_discard;