From: Alamy Liu <alamy.liu@gmail.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Alamy Liu <alamy.liu@gmail.com>,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] mmc: cqhci: replace DCMD_SLOT with cq_host->dcmd_slot
Date: Mon, 14 Jan 2019 11:17:22 -0800 [thread overview]
Message-ID: <20190114191724.29960-2-alamy.liu@gmail.com> (raw)
In-Reply-To: <20190114191724.29960-1-alamy.liu@gmail.com>
Prevent to use fixed value (DCMD_SLOT) after it had been determined
and saved in a variable (cq_host->dcmd).
Signed-off-by: Alamy Liu <alamy.liu@gmail.com>
---
drivers/mmc/host/cqhci.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index 26d63594b7..4cc7863c13 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -76,7 +76,8 @@ static void setup_trans_desc(struct cqhci_host *cq_host, u8 tag)
if (cq_host->link_desc_len > 8)
*(link_temp + 8) = 0;
- if (tag == DCMD_SLOT && (cq_host->mmc->caps2 & MMC_CAP2_CQE_DCMD)) {
+ if ((tag == cq_host->dcmd_slot)
+ && (cq_host->mmc->caps2 & MMC_CAP2_CQE_DCMD)) {
*link_temp = CQHCI_VALID(0) | CQHCI_ACT(0) | CQHCI_END(1);
return;
}
@@ -548,9 +549,9 @@ static void cqhci_post_req(struct mmc_host *host, struct mmc_request *mrq)
}
}
-static inline int cqhci_tag(struct mmc_request *mrq)
+static inline int cqhci_tag(struct mmc_request *mrq, struct cqhci_host *cq_host)
{
- return mrq->cmd ? DCMD_SLOT : mrq->tag;
+ return mrq->cmd ? cq_host->dcmd_slot : mrq->tag;
}
static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
@@ -558,8 +559,8 @@ static int cqhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
int err = 0;
u64 data = 0;
u64 *task_desc = NULL;
- int tag = cqhci_tag(mrq);
struct cqhci_host *cq_host = mmc->cqe_private;
+ int tag = cqhci_tag(mrq, cq_host);
unsigned long flags;
if (!cq_host->enabled) {
@@ -824,7 +825,7 @@ static bool cqhci_timeout(struct mmc_host *mmc, struct mmc_request *mrq,
bool *recovery_needed)
{
struct cqhci_host *cq_host = mmc->cqe_private;
- int tag = cqhci_tag(mrq);
+ int tag = cqhci_tag(mrq, cq_host);
struct cqhci_slot *slot = &cq_host->slot[tag];
unsigned long flags;
bool timed_out;
--
2.17.1
next prev parent reply other threads:[~2019-01-14 19:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 19:17 [PATCH 1/2] mmc: cqhci: replace NUM_SLOTS with cq_host->num_slots Alamy Liu
2019-01-14 19:17 ` Alamy Liu [this message]
2019-01-31 9:35 ` [PATCH 2/2] mmc: cqhci: replace DCMD_SLOT with cq_host->dcmd_slot Adrian Hunter
2019-01-28 11:38 ` [PATCH 1/2] mmc: cqhci: replace NUM_SLOTS with cq_host->num_slots Ulf Hansson
2019-01-31 9:32 ` Adrian Hunter
[not found] ` <CAJ3kudsgJsZ1KFXdD9Vnfx0GypnEf+ba-D8t+Wy1e8GdLF=U0w@mail.gmail.com>
[not found] ` <362c073b-d795-4431-f1dd-c203cc606a6f@codeaurora.org>
2019-02-08 10:34 ` Asutosh Das (asd)
2019-02-08 18:41 ` Alamy Liu
2019-02-11 8:56 ` Adrian Hunter
2019-02-11 23:04 ` Alamy Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190114191724.29960-2-alamy.liu@gmail.com \
--to=alamy.liu@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox