Commit e20a7ba9 authored Dec 16, 2020 by Zheng Yongjun Committed by sanglipeng Apr 16, 2024

mmc: core: convert comma to semicolon

stable inclusion
from stable-v5.10.203
commit bf62a283a779c03c3d97ca149b8368b37441b352
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9GXII

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=bf62a283a779c03c3d97ca149b8368b37441b352



--------------------------------

[ Upstream commit 6b1dc622 ]

Replace a comma between expression statements by a semicolon.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Link: https://lore.kernel.org/r/20201216131737.14883-1-zhengyongjun3@huawei.com


Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Stable-dep-of: 8155d1fa3a74 ("mmc: block: Retry commands in CQE error recovery")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: sanglipeng <sanglipeng1@jd.com>

parent 844bd696

drivers/mmc/core/core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -547,10 +547,10 @@ int mmc_cqe_recovery(struct mmc_host *host)
		host->cqe_ops->cqe_recovery_start(host);

		memset(&cmd, 0, sizeof(cmd));
		cmd.opcode = MMC_STOP_TRANSMISSION,
		cmd.flags = MMC_RSP_R1B \| MMC_CMD_AC,
		cmd.opcode = MMC_STOP_TRANSMISSION;
		cmd.flags = MMC_RSP_R1B \| MMC_CMD_AC;
		cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */
		cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT,
		cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
		mmc_wait_for_cmd(host, &cmd, 0);

		memset(&cmd, 0, sizeof(cmd));
		@@ -558,7 +558,7 @@ int mmc_cqe_recovery(struct mmc_host *host)
		cmd.arg = 1; /* Discard entire queue */
		cmd.flags = MMC_RSP_R1B \| MMC_CMD_AC;
		cmd.flags &= ~MMC_RSP_CRC; /* Ignore CRC */
		cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT,
		cmd.busy_timeout = MMC_CQE_RECOVERY_TIMEOUT;
		err = mmc_wait_for_cmd(host, &cmd, 0);

		host->cqe_ops->cqe_recovery_finish(host);