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

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Wolfram Sang and committed by
Ulf Hansson 5513d9be 76d62cde

+11 -13
+1 -1
drivers/mmc/core/block.c
··· 1220 1220 int err = 0; 1221 1221 blk_status_t status = BLK_STS_OK; 1222 1222 1223 - if (!mmc_can_erase(card)) { 1223 + if (!mmc_card_can_erase(card)) { 1224 1224 status = BLK_STS_NOTSUPP; 1225 1225 goto fail; 1226 1226 }
+4 -6
drivers/mmc/core/core.c
··· 1837 1837 } 1838 1838 EXPORT_SYMBOL(mmc_erase); 1839 1839 1840 - int mmc_can_erase(struct mmc_card *card) 1840 + bool mmc_card_can_erase(struct mmc_card *card) 1841 1841 { 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); 1845 1843 } 1846 - EXPORT_SYMBOL(mmc_can_erase); 1844 + EXPORT_SYMBOL(mmc_card_can_erase); 1847 1845 1848 1846 int mmc_can_trim(struct mmc_card *card) 1849 1847 { ··· 1864 1866 1865 1867 int mmc_can_sanitize(struct mmc_card *card) 1866 1868 { 1867 - if (!mmc_can_trim(card) && !mmc_can_erase(card)) 1869 + if (!mmc_can_trim(card) && !mmc_card_can_erase(card)) 1868 1870 return 0; 1869 1871 if (card->ext_csd.sec_feature_support & EXT_CSD_SEC_SANITIZE) 1870 1872 return 1;
+1 -1
drivers/mmc/core/core.h
··· 118 118 int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq); 119 119 120 120 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); 122 122 int mmc_can_trim(struct mmc_card *card); 123 123 bool mmc_card_can_discard(struct mmc_card *card); 124 124 int mmc_can_sanitize(struct mmc_card *card);
+4 -4
drivers/mmc/core/mmc_test.c
··· 1510 1510 { 1511 1511 struct mmc_test_area *t = &test->area; 1512 1512 1513 - if (!mmc_can_erase(test->card)) 1513 + if (!mmc_card_can_erase(test->card)) 1514 1514 return 0; 1515 1515 1516 1516 return mmc_erase(test->card, t->dev_addr, t->max_sz >> 9, ··· 1749 1749 if (!mmc_can_trim(test->card)) 1750 1750 return RESULT_UNSUP_CARD; 1751 1751 1752 - if (!mmc_can_erase(test->card)) 1752 + if (!mmc_card_can_erase(test->card)) 1753 1753 return RESULT_UNSUP_HOST; 1754 1754 1755 1755 for (sz = 512; sz < t->max_sz; sz <<= 1) { ··· 1866 1866 if (!mmc_can_trim(test->card)) 1867 1867 return RESULT_UNSUP_CARD; 1868 1868 1869 - if (!mmc_can_erase(test->card)) 1869 + if (!mmc_card_can_erase(test->card)) 1870 1870 return RESULT_UNSUP_HOST; 1871 1871 1872 1872 for (sz = 512; sz <= t->max_sz; sz <<= 1) { ··· 2114 2114 return 0; 2115 2115 2116 2116 /* prepare test area */ 2117 - if (mmc_can_erase(test->card) && 2117 + if (mmc_card_can_erase(test->card) && 2118 2118 tdata->prepare & MMC_TEST_PREP_ERASE) { 2119 2119 ret = mmc_erase(test->card, dev_addr, 2120 2120 size / 512, test->card->erase_arg);
+1 -1
drivers/mmc/core/queue.c
··· 352 352 }; 353 353 struct gendisk *disk; 354 354 355 - if (mmc_can_erase(card)) 355 + if (mmc_card_can_erase(card)) 356 356 mmc_queue_setup_discard(card, &lim); 357 357 358 358 lim.max_hw_sectors = min(host->max_blk_count, host->max_req_size / 512);