mmc: rename mmc_host_cmd23() to mmc_host_can_cmd23()

It is not obvious that this functions checks capabilities. Rename it to
include '_can' like other capability helpers.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250501063325.7262-7-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 63320cc441c1d1549f07083f272c8bb4ee4710ff..f9ad4547655230195ef45a4287802aeb59ed68d5 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -2618,7 +2618,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
         */
        md->read_only = mmc_blk_readonly(card);
 
-       if (mmc_host_cmd23(card->host)) {
+       if (mmc_host_can_cmd23(card->host)) {
                if ((mmc_card_mmc(card) &&
                     card->csd.mmca_vsn >= CSD_SPEC_VER_3) ||
                    (mmc_card_sd(card) && !mmc_card_ult_capacity(card) &&

diff --git a/drivers/mmc/core/host.h b/drivers/mmc/core/host.h
index 48c4952512a5875b337676b857a1beec2856b8ee..c8515cb8619257685bc51abb4bb3fcd248d69204 100644 (file)
--- a/drivers/mmc/core/host.h
+++ b/drivers/mmc/core/host.h
@@ -39,7 +39,7 @@ static inline void mmc_retune_recheck(struct mmc_host *host)
                host->retune_now = 1;
 }
 
-static inline int mmc_host_cmd23(struct mmc_host *host)
+static inline int mmc_host_can_cmd23(struct mmc_host *host)
 {
        return host->caps & MMC_CAP_CMD23;
 }

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e499835b05a9615204ffc4e058e87323c488f303..c2b92b508438edd7e90c378ab7755038d50d0965 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -578,7 +578,7 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd)
                 * RPMB regions are defined in multiples of 128K.
                 */
                card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
-               if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host)) {
+               if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_can_cmd23(card->host)) {
                        mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
                                EXT_CSD_PART_CONFIG_ACC_RPMB,
                                "rpmb", 0, false,

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index be2d2895b4c408a2afceae338876630f26cdb9ac..80e5d87a5e50bea772c06443bca8f48f042d6ad5 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -191,7 +191,7 @@ static void mmc_test_prepare_sbc(struct mmc_test_card *test,
 {
        struct mmc_card *card = test->card;
 
-       if (!mrq->sbc || !mmc_host_cmd23(card->host) ||
+       if (!mrq->sbc || !mmc_host_can_cmd23(card->host) ||
            !mmc_test_card_cmd23(card) || !mmc_op_multi(mrq->cmd->opcode) ||
            (card->quirks & MMC_QUIRK_BLK_NO_CMD23)) {
                mrq->sbc = NULL;
@@ -2390,7 +2390,7 @@ static int mmc_test_ongoing_transfer(struct mmc_test_card *test,
                             512, write);
 
        if (use_sbc && t->blocks > 1 && !mrq->sbc) {
-               ret =  mmc_host_cmd23(host) ?
+               ret =  mmc_host_can_cmd23(host) ?
                       RESULT_UNSUP_CARD :
                       RESULT_UNSUP_HOST;
                goto out_free;