mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +00:00
659f4a13dd
With Linux 6.1 many of our downstream patches and out-of-tree files can be removed or at least replaced by backported upstream commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org> [fix CMDLINE_OVERRIDE for arm64] Signed-off-by: Bjørn Mork <bjorn@mork.no>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From b98e7e8daf0ebab9dcc36812378a71e1be0b5089 Mon Sep 17 00:00:00 2001
|
|
From: ChanWoo Lee <cw9316.lee@samsung.com>
|
|
Date: Thu, 24 Nov 2022 17:00:31 +0900
|
|
Subject: [PATCH 4/6] mmc: Avoid open coding by using mmc_op_tuning()
|
|
|
|
Replace code with the already defined function. No functional changes.
|
|
|
|
Signed-off-by: ChanWoo Lee <cw9316.lee@samsung.com>
|
|
Reviewed-by: Adrian Hunter <adrian.hunter@intel.com>
|
|
Link: https://lore.kernel.org/r/20221124080031.14690-1-cw9316.lee@samsung.com
|
|
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
|
|
---
|
|
drivers/mmc/host/mtk-sd.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/mtk-sd.c
|
|
+++ b/drivers/mmc/host/mtk-sd.c
|
|
@@ -1224,9 +1224,7 @@ static bool msdc_cmd_done(struct msdc_ho
|
|
|
|
if (!sbc_error && !(events & MSDC_INT_CMDRDY)) {
|
|
if (events & MSDC_INT_CMDTMO ||
|
|
- (cmd->opcode != MMC_SEND_TUNING_BLOCK &&
|
|
- cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200 &&
|
|
- !host->hs400_tuning))
|
|
+ (!mmc_op_tuning(cmd->opcode) && !host->hs400_tuning))
|
|
/*
|
|
* should not clear fifo/interrupt as the tune data
|
|
* may have already come when cmd19/cmd21 gets response
|
|
@@ -1320,9 +1318,7 @@ static void msdc_cmd_next(struct msdc_ho
|
|
{
|
|
if ((cmd->error &&
|
|
!(cmd->error == -EILSEQ &&
|
|
- (cmd->opcode == MMC_SEND_TUNING_BLOCK ||
|
|
- cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200 ||
|
|
- host->hs400_tuning))) ||
|
|
+ (mmc_op_tuning(cmd->opcode) || host->hs400_tuning))) ||
|
|
(mrq->sbc && mrq->sbc->error))
|
|
msdc_request_done(host, mrq);
|
|
else if (cmd == mrq->sbc)
|