diff options
| author | saturneric <[email protected]> | 2025-06-11 23:38:21 +0000 |
|---|---|---|
| committer | saturneric <[email protected]> | 2025-06-11 23:38:21 +0000 |
| commit | 0e99f621a88db810f7f95ccb917cf00924cb6e39 (patch) | |
| tree | 21f3653194dcc5e81bfb0205155a152f727f4cf3 /drivers/mmc/core/queue.c | |
| parent | Merge tag 'v6.15' (diff) | |
| parent | Linux 6.16-rc1 (diff) | |
| download | kernel-0e99f621a88db810f7f95ccb917cf00924cb6e39.tar.gz kernel-0e99f621a88db810f7f95ccb917cf00924cb6e39.zip | |
Merge tag 'v6.16-rc1'
Linux 6.16-rc1
Diffstat (limited to 'drivers/mmc/core/queue.c')
| -rw-r--r-- | drivers/mmc/core/queue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 5dcc9a256473..feda8ddbd8b6 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -184,9 +184,9 @@ 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) + 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 */ @@ -361,7 +361,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); |