github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 02:53:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mmc: dw_mmc: Remove mrq from struct dw_mci_slot

Browse Source 
struct dw_mci has already kept mrq, so removing keeping mrq again from
struct dw_mci_slot.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Shawn Lin 2025-12-16 19:50:05 +08:00 committed by Ulf Hansson
parent 027e1688bc
commit 78983c4d60
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/dw_mmc.c
View File

@ -108,7 +108,7 @@ static int dw_mci_req_show(struct seq_file *s, void *v)
/* Make sure we get a consistent snapshot */
spin_lock_bh(&slot->host->lock);
mrq = slot->mrq;
mrq = slot->host->mrq;
if (mrq) {
cmd = mrq->cmd;
@ -1260,7 +1260,7 @@ static void __dw_mci_start_request(struct dw_mci *host,
struct mmc_data *data;
u32 cmdflags;
mrq = slot->mrq;
mrq = host->mrq;
host->mrq = mrq;
@ -1316,7 +1316,7 @@ static void __dw_mci_start_request(struct dw_mci *host,
static void dw_mci_start_request(struct dw_mci *host,
struct dw_mci_slot *slot)
{
struct mmc_request *mrq = slot->mrq;
struct mmc_request *mrq = host->mrq;
struct mmc_command *cmd;
cmd = mrq->sbc ? mrq->sbc : mrq->cmd;
@ -1330,7 +1330,7 @@ static void dw_mci_queue_request(struct dw_mci *host, struct dw_mci_slot *slot,
dev_vdbg(&host->mmc->class_dev, "queue request: state=%d\n",
host->state);
slot->mrq = mrq;
host->mrq = mrq;
if (host->state == STATE_WAITING_CMD11_DONE) {
dev_warn(&host->mmc->class_dev,
@ -1356,7 +1356,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq)
struct dw_mci_slot *slot = mmc_priv(mmc);
struct dw_mci *host = slot->host;
WARN_ON(slot->mrq);
WARN_ON(host->mrq);
/*
* The check for card presence and queueing of the request must be
@ -1816,7 +1816,6 @@ static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
WARN_ON(host->cmd || host->data);
host->slot->mrq = NULL;
host->mrq = NULL;
if (!list_empty(&host->queue)) {
slot = list_entry(host->queue.next,

4
drivers/mmc/host/dw_mmc.h
View File

@ -64,7 +64,7 @@ struct dw_mci_dma_slave {
* @fifo_reg: Pointer to MMIO registers for data FIFO
* @sg: Scatterlist entry currently being processed by PIO code, if any.
* @sg_miter: PIO mapping scatterlist iterator.
* @mrq: The request currently being processed on @slot,
* @mrq: The request currently being processed on @host,
* or NULL if the controller is idle.
* @cmd: The command currently being sent to the card, or NULL.
* @data: The data currently being transferred, or NULL if no data
@ -559,7 +559,6 @@ static inline int dw_mci_runtime_resume(struct device *device) { return -EOPNOTS
/**
* struct dw_mci_slot - MMC slot state
* @host: The MMC controller this slot is using.
* @mrq: mmc_request currently being processed or waiting to be
* processed, or NULL when the slot is idle.
* @queue_node: List node for placing this node in the @queue list of
* &struct dw_mci.
@ -568,7 +567,6 @@ static inline int dw_mci_runtime_resume(struct device *device) { return -EOPNOTS
struct dw_mci_slot {
struct dw_mci *host;
struct mmc_request *mrq;
struct list_head queue_node;
};