Skip to content

Commit 5513d9b

Browse files
Wolfram SangUlf Hansson
authored andcommitted
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>
1 parent 76d62cd commit 5513d9b

5 files changed

Lines changed: 11 additions & 13 deletions

File tree

drivers/mmc/core/block.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *req,
12201220
int err = 0;
12211221
blk_status_t status = BLK_STS_OK;
12221222

1223-
if (!mmc_can_erase(card)) {
1223+
if (!mmc_card_can_erase(card)) {
12241224
status = BLK_STS_NOTSUPP;
12251225
goto fail;
12261226
}

drivers/mmc/core/core.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,13 +1837,11 @@ int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr,
18371837
}
18381838
EXPORT_SYMBOL(mmc_erase);
18391839

1840-
int mmc_can_erase(struct mmc_card *card)
1840+
bool mmc_card_can_erase(struct mmc_card *card)
18411841
{
1842-
if (card->csd.cmdclass & CCC_ERASE && card->erase_size)
1843-
return 1;
1844-
return 0;
1842+
return (card->csd.cmdclass & CCC_ERASE && card->erase_size);
18451843
}
1846-
EXPORT_SYMBOL(mmc_can_erase);
1844+
EXPORT_SYMBOL(mmc_card_can_erase);
18471845

18481846
int mmc_can_trim(struct mmc_card *card)
18491847
{
@@ -1866,7 +1864,7 @@ EXPORT_SYMBOL(mmc_card_can_discard);
18661864

18671865
int mmc_can_sanitize(struct mmc_card *card)
18681866
{
1869-
if (!mmc_can_trim(card) && !mmc_can_erase(card))
1867+
if (!mmc_can_trim(card) && !mmc_card_can_erase(card))
18701868
return 0;
18711869
if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE)
18721870
return 1;

drivers/mmc/core/core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq);
118118
int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq);
119119

120120
int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr, unsigned int arg);
121-
int mmc_can_erase(struct mmc_card *card);
121+
bool mmc_card_can_erase(struct mmc_card *card);
122122
int mmc_can_trim(struct mmc_card *card);
123123
bool mmc_card_can_discard(struct mmc_card *card);
124124
int mmc_can_sanitize(struct mmc_card *card);

drivers/mmc/core/mmc_test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,7 +1510,7 @@ static int mmc_test_area_erase(struct mmc_test_card *test)
15101510
{
15111511
struct mmc_test_area *t = &test->area;
15121512

1513-
if (!mmc_can_erase(test->card))
1513+
if (!mmc_card_can_erase(test->card))
15141514
return 0;
15151515

15161516
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)
17491749
if (!mmc_can_trim(test->card))
17501750
return RESULT_UNSUP_CARD;
17511751

1752-
if (!mmc_can_erase(test->card))
1752+
if (!mmc_card_can_erase(test->card))
17531753
return RESULT_UNSUP_HOST;
17541754

17551755
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)
18661866
if (!mmc_can_trim(test->card))
18671867
return RESULT_UNSUP_CARD;
18681868

1869-
if (!mmc_can_erase(test->card))
1869+
if (!mmc_card_can_erase(test->card))
18701870
return RESULT_UNSUP_HOST;
18711871

18721872
for (sz = 512; sz <= t->max_sz; sz <<= 1) {
@@ -2114,7 +2114,7 @@ static int mmc_test_rw_multiple(struct mmc_test_card *test,
21142114
return 0;
21152115

21162116
/* prepare test area */
2117-
if (mmc_can_erase(test->card) &&
2117+
if (mmc_card_can_erase(test->card) &&
21182118
tdata->prepare & MMC_TEST_PREP_ERASE) {
21192119
ret = mmc_erase(test->card, dev_addr,
21202120
size / 512, test->card->erase_arg);

drivers/mmc/core/queue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ static struct gendisk *mmc_alloc_disk(struct mmc_queue *mq,
352352
};
353353
struct gendisk *disk;
354354

355-
if (mmc_can_erase(card))
355+
if (mmc_card_can_erase(card))
356356
mmc_queue_setup_discard(card, &lim);
357357

358358
lim.max_hw_sectors = min(host->max_blk_count, host->max_req_size / 512);

0 commit comments

Comments
 (0)