mmc: rename mmc_can_erase() to mmc_card_can_erase()

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-3-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 4830628510e6e2ff06e5cd25bff8e1dd39d9f838..e9213de4a9fe91c6e94fd95d46edbe7dad1c1f62 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1220,7 +1220,7 @@ static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *req,
        int err = 0;
        blk_status_t status = BLK_STS_OK;
 
-       if (!mmc_can_erase(card)) {
+       if (!mmc_card_can_erase(card)) {
                status = BLK_STS_NOTSUPP;
                goto fail;
        }

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 8bc46ea370e86232032d10d6d2573ce29a0f07dc..e7449d03f311f632d0f76e4c5873e5eed8a51455 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1837,13 +1837,11 @@ int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr,
 }
 EXPORT_SYMBOL(mmc_erase);
 
-int mmc_can_erase(struct mmc_card *card)
+bool mmc_card_can_erase(struct mmc_card *card)
 {
-       if (card->csd.cmdclass & CCC_ERASE && card->erase_size)
-               return 1;
-       return 0;
+       return (card->csd.cmdclass & CCC_ERASE && card->erase_size);
 }
-EXPORT_SYMBOL(mmc_can_erase);
+EXPORT_SYMBOL(mmc_card_can_erase);
 
 int mmc_can_trim(struct mmc_card *card)
 {
@@ -1866,7 +1864,7 @@ EXPORT_SYMBOL(mmc_card_can_discard);
 
 int mmc_can_sanitize(struct mmc_card *card)
 {
-       if (!mmc_can_trim(card) && !mmc_can_erase(card))
+       if (!mmc_can_trim(card) && !mmc_card_can_erase(card))
                return 0;
        if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE)
                return 1;

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index e88b64379ab0e4f47ea85325e885e6f449d13d31..2e66d832162661a150b4bc4a9ba3f247f6151e6b 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -118,7 +118,7 @@ bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq);
 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);
-int mmc_can_erase(struct mmc_card *card);
+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);

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index 4f4286b8e0f20107b0e2970bb7fa53a6eb5608e5..190ae178da84f0206e393499197cc50514f6b35c 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -1510,7 +1510,7 @@ static int mmc_test_area_erase(struct mmc_test_card *test)
 {
        struct mmc_test_area *t = &test->area;
 
-       if (!mmc_can_erase(test->card))
+       if (!mmc_card_can_erase(test->card))
                return 0;
 
        return mmc_erase(test->card, t->dev_addr, t->max_sz >> 9,
@@ -1749,7 +1749,7 @@ static int mmc_test_profile_trim_perf(struct mmc_test_card *test)
        if (!mmc_can_trim(test->card))
                return RESULT_UNSUP_CARD;
 
-       if (!mmc_can_erase(test->card))
+       if (!mmc_card_can_erase(test->card))
                return RESULT_UNSUP_HOST;
 
        for (sz = 512; sz < t->max_sz; sz <<= 1) {
@@ -1866,7 +1866,7 @@ static int mmc_test_profile_seq_trim_perf(struct mmc_test_card *test)
        if (!mmc_can_trim(test->card))
                return RESULT_UNSUP_CARD;
 
-       if (!mmc_can_erase(test->card))
+       if (!mmc_card_can_erase(test->card))
                return RESULT_UNSUP_HOST;
 
        for (sz = 512; sz <= t->max_sz; sz <<= 1) {
@@ -2114,7 +2114,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test,
                return 0;
 
        /* prepare test area */
-       if (mmc_can_erase(test->card) &&
+       if (mmc_card_can_erase(test->card) &&
            tdata->prepare & MMC_TEST_PREP_ERASE) {
                ret = mmc_erase(test->card, dev_addr,
                                size / 512, test->card->erase_arg);

diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
index 3ba62f825b8457ed5c87875bdc2fd4144d594fb2..099fee86d08803375dc1f2a4b345dd034592ad0f 100644 (file)
--- a/drivers/mmc/core/queue.c
+++ b/drivers/mmc/core/queue.c
@@ -352,7 +352,7 @@ static struct gendisk *mmc_alloc_disk(struct mmc_queue *mq,
        };
        struct gendisk *disk;
 
-       if (mmc_can_erase(card))
+       if (mmc_card_can_erase(card))
                mmc_queue_setup_discard(card, &lim);
 
        lim.max_hw_sectors = min(host->max_blk_count, host->max_req_size / 512);