mmc: mmc_test: use mmc_card cmd23 helpers

Use mmc_card_can_cmd23 instead of using a local and partial
implementation, and check for the CMD23 quirk with
mmc_card_blk_no_cmd23.

Signed-off-by: Benoît Monin <benoit.monin@bootlin.com>
Link: https://lore.kernel.org/r/20250818-mobileye-emmc-for-upstream-4-v4-3-34ecb3995e96@bootlin.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index 80e5d87a5e50bea772c06443bca8f48f042d6ad5..67d4a301895c905bf52776f970bfc7a8f86a65aa 100644 (file)
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -180,20 +180,14 @@ static int mmc_test_set_blksize(struct mmc_test_card *test, unsigned size)
        return mmc_set_blocklen(test->card, size);
 }
 
-static bool mmc_test_card_cmd23(struct mmc_card *card)
-{
-       return mmc_card_mmc(card) ||
-              (mmc_card_sd(card) && card->scr.cmds & SD_SCR_CMD23_SUPPORT);
-}
-
 static void mmc_test_prepare_sbc(struct mmc_test_card *test,
                                 struct mmc_request *mrq, unsigned int blocks)
 {
        struct mmc_card *card = test->card;
 
        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)) {
+           !mmc_card_can_cmd23(card) || !mmc_op_multi(mrq->cmd->opcode) ||
+           mmc_card_blk_no_cmd23(card)) {
                mrq->sbc = NULL;
                return;
        }