mmc: core: Introduce the MMC_RSP_R1B_NO_CRC response

The R1B response type with ignoring CRC is used in the mmc_cqe_recovery(),
introduce the MMC_RSP_R1B_NO_CRC response type to simplify the code.

Signed-off-by: Andy-ld Lu <andy-ld.lu@mediatek.com>
Message-ID: <20241126125041.16071-2-andy-ld.lu@mediatek.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d996d39c0d6fa1b837313eb752667b20289f6727..4ba28a10b2dfa9d564b769a6882ee0a5481797d2 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -557,8 +557,7 @@ int mmc_cqe_recovery(struct mmc_host *host)
 
        memset(&cmd, 0, sizeof(cmd));
        cmd.opcode       = MMC_STOP_TRANSMISSION;
-       cmd.flags        = MMC_RSP_R1B | MMC_CMD_AC;
-       cmd.flags       &= ~MMC_RSP_CRC; /* Ignore CRC */
+       cmd.flags        = MMC_RSP_R1B_NO_CRC | MMC_CMD_AC; /* Ignore CRC */
        cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
        mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
 
@@ -567,8 +566,7 @@ int mmc_cqe_recovery(struct mmc_host *host)
        memset(&cmd, 0, sizeof(cmd));
        cmd.opcode       = MMC_CMDQ_TASK_MGMT;
        cmd.arg          = 1; /* Discard entire queue */
-       cmd.flags        = MMC_RSP_R1B | MMC_CMD_AC;
-       cmd.flags       &= ~MMC_RSP_CRC; /* Ignore CRC */
+       cmd.flags        = MMC_RSP_R1B_NO_CRC | MMC_CMD_AC; /* Ignore CRC */
        cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
        err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);
 

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index e13856ab6ad05be6925ecd81a3ee7bab369c1d27..01e0f591a20b145e5dbcab238cf6c36c2e18a1fc 100644 (file)
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -57,6 +57,7 @@ struct mmc_command {
 #define MMC_RSP_NONE   (0)
 #define MMC_RSP_R1     (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
 #define MMC_RSP_R1B    (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
+#define MMC_RSP_R1B_NO_CRC (MMC_RSP_PRESENT|MMC_RSP_OPCODE|MMC_RSP_BUSY)
 #define MMC_RSP_R2     (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
 #define MMC_RSP_R3     (MMC_RSP_PRESENT)
 #define MMC_RSP_R4     (MMC_RSP_PRESENT)