Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Wolfram Sang and committed by
Ulf Hansson
b89d05f6 e3df5ae4

+12 -14
+1 -1
drivers/mmc/core/block.c
··· 1284 1284 from = blk_rq_pos(req); 1285 1285 nr = blk_rq_sectors(req); 1286 1286 1287 - if (mmc_can_trim(card) && !mmc_erase_group_aligned(card, from, nr)) 1287 + if (mmc_card_can_trim(card) && !mmc_erase_group_aligned(card, from, nr)) 1288 1288 arg = MMC_SECURE_TRIM1_ARG; 1289 1289 else 1290 1290 arg = MMC_SECURE_ERASE_ARG;
+6 -8
drivers/mmc/core/core.c
··· 1843 1843 } 1844 1844 EXPORT_SYMBOL(mmc_card_can_erase); 1845 1845 1846 - int mmc_can_trim(struct mmc_card *card) 1846 + bool mmc_card_can_trim(struct mmc_card *card) 1847 1847 { 1848 - if ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN) && 1849 - (!(card->quirks & MMC_QUIRK_TRIM_BROKEN))) 1850 - return 1; 1851 - return 0; 1848 + return ((card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN) && 1849 + (!(card->quirks & MMC_QUIRK_TRIM_BROKEN))); 1852 1850 } 1853 - EXPORT_SYMBOL(mmc_can_trim); 1851 + EXPORT_SYMBOL(mmc_card_can_trim); 1854 1852 1855 1853 bool mmc_card_can_discard(struct mmc_card *card) 1856 1854 { ··· 1862 1864 1863 1865 bool mmc_card_can_sanitize(struct mmc_card *card) 1864 1866 { 1865 - if (!mmc_can_trim(card) && !mmc_card_can_erase(card)) 1867 + if (!mmc_card_can_trim(card) && !mmc_card_can_erase(card)) 1866 1868 return false; 1867 1869 if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE) 1868 1870 return true; ··· 1979 1981 return card->pref_erase; 1980 1982 1981 1983 max_discard = mmc_do_calc_max_discard(card, MMC_ERASE_ARG); 1982 - if (mmc_can_trim(card)) { 1984 + if (mmc_card_can_trim(card)) { 1983 1985 max_trim = mmc_do_calc_max_discard(card, MMC_TRIM_ARG); 1984 1986 if (max_trim < max_discard || max_discard == 0) 1985 1987 max_discard = max_trim;
+1 -1
drivers/mmc/core/core.h
··· 119 119 120 120 int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr, unsigned int arg); 121 121 bool mmc_card_can_erase(struct mmc_card *card); 122 - int mmc_can_trim(struct mmc_card *card); 122 + bool mmc_card_can_trim(struct mmc_card *card); 123 123 bool mmc_card_can_discard(struct mmc_card *card); 124 124 bool mmc_card_can_sanitize(struct mmc_card *card); 125 125 bool mmc_card_can_secure_erase_trim(struct mmc_card *card);
+1 -1
drivers/mmc/core/mmc.c
··· 1806 1806 /* set erase_arg */ 1807 1807 if (mmc_card_can_discard(card)) 1808 1808 card->erase_arg = MMC_DISCARD_ARG; 1809 - else if (mmc_can_trim(card)) 1809 + else if (mmc_card_can_trim(card)) 1810 1810 card->erase_arg = MMC_TRIM_ARG; 1811 1811 else 1812 1812 card->erase_arg = MMC_ERASE_ARG;
+2 -2
drivers/mmc/core/mmc_test.c
··· 1746 1746 struct timespec64 ts1, ts2; 1747 1747 int ret; 1748 1748 1749 - if (!mmc_can_trim(test->card)) 1749 + if (!mmc_card_can_trim(test->card)) 1750 1750 return RESULT_UNSUP_CARD; 1751 1751 1752 1752 if (!mmc_card_can_erase(test->card)) ··· 1863 1863 struct timespec64 ts1, ts2; 1864 1864 int ret; 1865 1865 1866 - if (!mmc_can_trim(test->card)) 1866 + if (!mmc_card_can_trim(test->card)) 1867 1867 return RESULT_UNSUP_CARD; 1868 1868 1869 1869 if (!mmc_card_can_erase(test->card))
+1 -1
drivers/mmc/core/queue.c
··· 186 186 lim->max_hw_discard_sectors = max_discard; 187 187 if (mmc_card_can_secure_erase_trim(card)) 188 188 lim->max_secure_erase_sectors = max_discard; 189 - if (mmc_can_trim(card) && card->erased_byte == 0) 189 + if (mmc_card_can_trim(card) && card->erased_byte == 0) 190 190 lim->max_write_zeroes_sectors = max_discard; 191 191 192 192 /* granularity must not be greater than max. discard */