From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-m32115.qiye.163.com (mail-m32115.qiye.163.com [220.197.32.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1340045C0B for ; Wed, 26 Nov 2025 00:24:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.32.115 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764116679; cv=none; b=l7SUP/Luxdh4DS7onABA+w9poyOLia4QC3pd8lXtBXmEJLqgwMOyqpv87moVkNXMyr04lN2TKyD+ZVQuVFFet2Evku7Blx9RgQPXgiaN0ynYjmpqK7ETBkQT0ARv4dbKrlSX+sDpr1k6Ie7TEyELmeiNdjAfIU/gKQH5GifAqYE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764116679; c=relaxed/simple; bh=P6hVD4DMx5mgu1xkyXsWL5XpWWqqwY1tXNmWPgu1k7o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=RQ9JvVUkScAJhRDZFMXnaXOlIwE47kU3jMXYkl2ZB/m+96Wnmb37JUCR6S0tFSSPOm7C8RpWla0GBUPigYQ87tN88Yy2tY3a6kbnawJjuZSRvxlJKjjUwTYI3Ln8HCsAHvAPm9NRFLPZXC52G4DJ2GWlbLyapBWH05vyu7Q6dfk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com; spf=pass smtp.mailfrom=rock-chips.com; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b=LHEqepof; arc=none smtp.client-ip=220.197.32.115 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rock-chips.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rock-chips.com header.i=@rock-chips.com header.b="LHEqepof" Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.qiye.163.com (Hmail) with ESMTP id 2ae367034; Wed, 26 Nov 2025 08:19:19 +0800 (GMT+08:00) From: Shawn Lin To: Ulf Hansson Cc: linux-mmc@vger.kernel.org, Jaehoon Chung , Shawn Lin Subject: [PATCH v2 11/13] mmc: dw_mmc: Remove mrq from struct dw_mci_slot Date: Wed, 26 Nov 2025 08:14:51 +0800 Message-Id: <1764116093-5430-12-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1764116093-5430-1-git-send-email-shawn.lin@rock-chips.com> References: <1764116093-5430-1-git-send-email-shawn.lin@rock-chips.com> X-HM-Tid: 0a9abd87699e09cckunme6f559504dd9ac X-HM-MType: 1 X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFDSUNOT01LS0k3V1ktWUFJV1kPCRoVCBIfWUFZGUxMQlZKT04dTkxKH0hMTkNWFRQJFh oXVRMBExYaEhckFA4PWVdZGBILWUFZTkNVSUlVTFVKSk9ZV1kWGg8SFR0UWUFZT0tIVUpLSU9PT0 hVSktLVUpCS0tZBg++ DKIM-Signature: a=rsa-sha256; b=LHEqepofjo/RCRGIF0zQAa++32uRdaYS3zyDgEtam5bzbM4czWslxDvoqSr5C6uAALltUDSNbUI2n+HDy+5PkVJaw+xj3cFOV8n8c+RIAxqSAkfo9X1HrqaKeGcZz1X6YCYVq0HdKA/EpPLFTg9ZHhp0gFWUdJg3/UnrmYa7TFg=; c=relaxed/relaxed; s=default; d=rock-chips.com; v=1; bh=/uuS2IS46Za4azQxj7iKCGfRh3Ruzg2msSpv33WJJ5A=; h=date:mime-version:subject:message-id:from; Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: struct dw_mci has already kept mrq, so removing keeping mrq again from struct dw_mci_slot. Signed-off-by: Shawn Lin --- Changes in v2: None drivers/mmc/host/dw_mmc.c | 11 +++++------ drivers/mmc/host/dw_mmc.h | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 7386a6f..56d2bc3d 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -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; @@ -1257,7 +1257,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; @@ -1313,7 +1313,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; @@ -1327,7 +1327,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, @@ -1353,7 +1353,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 @@ -1815,7 +1815,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, diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 99a69da..f91f5fc 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -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; }; -- 2.7.4