323-v6.2-mmc-Avoid-open-coding-by-using-mmc_op_tuning.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From b98e7e8daf0ebab9dcc36812378a71e1be0b5089 Mon Sep 17 00:00:00 2001
  2. From: ChanWoo Lee <[email protected]>
  3. Date: Thu, 24 Nov 2022 17:00:31 +0900
  4. Subject: [PATCH 4/6] mmc: Avoid open coding by using mmc_op_tuning()
  5. Replace code with the already defined function. No functional changes.
  6. Signed-off-by: ChanWoo Lee <[email protected]>
  7. Reviewed-by: Adrian Hunter <[email protected]>
  8. Link: https://lore.kernel.org/r/[email protected]
  9. Signed-off-by: Ulf Hansson <[email protected]>
  10. ---
  11. drivers/mmc/host/mtk-sd.c | 8 ++------
  12. 1 file changed, 2 insertions(+), 6 deletions(-)
  13. --- a/drivers/mmc/host/mtk-sd.c
  14. +++ b/drivers/mmc/host/mtk-sd.c
  15. @@ -1224,9 +1224,7 @@ static bool msdc_cmd_done(struct msdc_ho
  16. if (!sbc_error && !(events & MSDC_INT_CMDRDY)) {
  17. if (events & MSDC_INT_CMDTMO ||
  18. - (cmd->opcode != MMC_SEND_TUNING_BLOCK &&
  19. - cmd->opcode != MMC_SEND_TUNING_BLOCK_HS200 &&
  20. - !host->hs400_tuning))
  21. + (!mmc_op_tuning(cmd->opcode) && !host->hs400_tuning))
  22. /*
  23. * should not clear fifo/interrupt as the tune data
  24. * may have already come when cmd19/cmd21 gets response
  25. @@ -1320,9 +1318,7 @@ static void msdc_cmd_next(struct msdc_ho
  26. {
  27. if ((cmd->error &&
  28. !(cmd->error == -EILSEQ &&
  29. - (cmd->opcode == MMC_SEND_TUNING_BLOCK ||
  30. - cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200 ||
  31. - host->hs400_tuning))) ||
  32. + (mmc_op_tuning(cmd->opcode) || host->hs400_tuning))) ||
  33. (mrq->sbc && mrq->sbc->error))
  34. msdc_request_done(host, mrq);
  35. else if (cmd == mrq->sbc)