mmc: rename mmc_can_trim() to mmc_card_can_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-10-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 02a11a757360c08a8558e430add9690833f35644..63320cc441c1d1549f07083f272c8bb4ee4710ff 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1284,7 +1284,7 @@ static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
        from = blk_rq_pos(req);
        nr = blk_rq_sectors(req);
 
-       if (mmc_can_trim(card) && !mmc_erase_group_aligned(card, from, nr))
+       if (mmc_card_can_trim(card) && !mmc_erase_group_aligned(card, from, nr))
                arg = MMC_SECURE_TRIM1_ARG;
        else
                arg = MMC_SECURE_ERASE_ARG;

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index f451903891a1fc5ca8923874059b148177c118b6..a0e2dce7043435e44879b005e84ca84d46f64e5a 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1843,14 +1843,12 @@ bool mmc_card_can_erase(struct mmc_card *card)
 }
 EXPORT_SYMBOL(mmc_card_can_erase);
 
-int mmc_can_trim(struct mmc_card *card)
+bool mmc_card_can_trim(struct mmc_card *card)
 {
-       if ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN) &&
-           (!(card->quirks & MMC_QUIRK_TRIM_BROKEN)))
-               return 1;
-       return 0;
+       return ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN) &&
+               (!(card->quirks & MMC_QUIRK_TRIM_BROKEN)));
 }
-EXPORT_SYMBOL(mmc_can_trim);
+EXPORT_SYMBOL(mmc_card_can_trim);
 
 bool mmc_card_can_discard(struct mmc_card *card)
 {
@@ -1864,7 +1862,7 @@ EXPORT_SYMBOL(mmc_card_can_discard);
 
 bool mmc_card_can_sanitize(struct mmc_card *card)
 {
-       if (!mmc_can_trim(card) && !mmc_card_can_erase(card))
+       if (!mmc_card_can_trim(card) && !mmc_card_can_erase(card))
                return false;
        if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE)
                return true;
@@ -1981,7 +1979,7 @@ unsigned int mmc_calc_max_discard(struct mmc_card *card)
                return card->pref_erase;
 
        max_discard = mmc_do_calc_max_discard(card, MMC_ERASE_ARG);
-       if (mmc_can_trim(card)) {
+       if (mmc_card_can_trim(card)) {
                max_trim = mmc_do_calc_max_discard(card, MMC_TRIM_ARG);
                if (max_trim < max_discard || max_discard == 0)
                        max_discard = max_trim;

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 3f7bd25e95570dc9f42b6985a735c9dc8044ba08..622085cd766f91334d5b9362cd7b96245af8884d 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -119,7 +119,7 @@ int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq);
 
 int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr, unsigned int arg);
 bool mmc_card_can_erase(struct mmc_card *card);
-int mmc_can_trim(struct mmc_card *card);
+bool mmc_card_can_trim(struct mmc_card *card);
 bool mmc_card_can_discard(struct mmc_card *card);
 bool mmc_card_can_sanitize(struct mmc_card *card);
 bool mmc_card_can_secure_erase_trim(struct mmc_card *card);

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 29970f1478f53064bfe953853d3f0e318395d3be..e499835b05a9615204ffc4e058e87323c488f303 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1806,7 +1806,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
        /* set erase_arg */
        if (mmc_card_can_discard(card))
                card->erase_arg = MMC_DISCARD_ARG;
-       else if (mmc_can_trim(card))
+       else if (mmc_card_can_trim(card))
                card->erase_arg = MMC_TRIM_ARG;
        else
                card->erase_arg = MMC_ERASE_ARG;

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index 190ae178da84f0206e393499197cc50514f6b35c..be2d2895b4c408a2afceae338876630f26cdb9ac 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -1746,7 +1746,7 @@ static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
        struct timespec64 ts1, ts2;
        int ret;
 
-       if (!mmc_can_trim(test->card))
+       if (!mmc_card_can_trim(test->card))
                return RESULT_UNSUP_CARD;
 
        if (!mmc_card_can_erase(test->card))
@@ -1863,7 +1863,7 @@ static int mmc_test_profile_seq_trim_perf(struct mmc_test_card *test)
        struct timespec64 ts1, ts2;
        int ret;
 
-       if (!mmc_can_trim(test->card))
+       if (!mmc_card_can_trim(test->card))
                return RESULT_UNSUP_CARD;
 
        if (!mmc_card_can_erase(test->card))

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index f65bf1717bbd4955020c78dd929fe687a476e36d..284856c8f65590dda58b9636a1d86821036e52b4 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -186,7 +186,7 @@ static void mmc_queue_setup_discard(struct mmc_card *card,
        lim->max_hw_discard_sectors = max_discard;
        if (mmc_card_can_secure_erase_trim(card))
                lim->max_secure_erase_sectors = max_discard;
-       if (mmc_can_trim(card) && card->erased_byte == 0)
+       if (mmc_card_can_trim(card) && card->erased_byte == 0)
                lim->max_write_zeroes_sectors = max_discard;
 
        /* granularity must not be greater than max. discard */