Received-SPF: pass (google.com: domain of linux-kernel+bounces-197476-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
From: Frank Li <Frank.Li@nxp.com>
To: Vinod Koul <vkoul@kernel.org>,
	imx@lists.linux.dev (open list:FREESCALE eDMA DRIVER),
	dmaengine@vger.kernel.org (open list:FREESCALE eDMA DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/2] dmaengine: fsl-edma: remove redundant "idle" field from fsl_chan
Date: Fri, 31 May 2024 17:01:52 -0400
Message-Id: <20240531210152.1878443-2-Frank.Li@nxp.com>
In-Reply-To: <20240531210152.1878443-1-Frank.Li@nxp.com>
References: <20240531210152.1878443-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?EXIFYLGA93Ix4dd4N/g3iQ/1cqQWSoF8h3rIucJn80Svd+DD+mUnTyKgNU8B?=
 =?us-ascii?Q?YUIu16Cx0G57SuO4G3cM7GoXVMDdr8v2YwzYrmYFUlyC1bJ7KkRiIy7190Fu?=
 =?us-ascii?Q?2cuxsCWAvGXEFwVQQs7E5fi+Tymr0zjKq+s1PyVBZc9ofbRPiqeUDi5VCPr8?=
 =?us-ascii?Q?SGEcGl9LgW4NUK3y2lKFD3G2M/bi7vCrSHMEoKAvnGiYZSEcSCl7972lNMN+?=
 =?us-ascii?Q?ZxEMBVnyvNxmuHmvhtyKsOflN0y7GD1zhpQpYsGGtiVEA+dIGY1Rhg/FD734?=
 =?us-ascii?Q?9StFyMVh4gVF9KG+WRvhfjoTkydInwctVJKuL2eSFOsygRq+PxYrH/z0GUov?=
 =?us-ascii?Q?hYKVJsUrmUPhtAJRYxzo1XHr0+fE3AOw33GvZKU7eWhQR0CGfDWk8Qgy0gzR?=
 =?us-ascii?Q?nFV+yn/v30lL/DQUp9E7thSr8QEhCd1krd7KbAgG7aAXY/Zsh8EGrxjaab48?=
 =?us-ascii?Q?55Dktku2TrWUCM1kHGBuSTk0FBoGRV8Y+bf2V9lbve1ZVCPjflIkU5RGviDz?=
 =?us-ascii?Q?6sawB5kngaZiPWhLLXTdQbpOtByfuEg62/GFTaM1jWOErCfTTNiQagvGjDD+?=
 =?us-ascii?Q?PLvxNL+uYK/wnrhnKh9Z3FaQkakrvcy36emlET0S467GzfaTzn1/pP+/OSpt?=
 =?us-ascii?Q?tLZ3zHplp67UiDftFEwDajeaQyYnEGcbjTyequJdBXOsud3SmtlCiNPL5f3c?=
 =?us-ascii?Q?/taRKcNQgwFflEWenjBoAx7SMxCdg7y62p0pvkZVgFrmdJRhpoEtADkFwo3s?=
 =?us-ascii?Q?Diz8rWkUMthncc7F8lokKrWEzcY9LV4PlA6T3+539P2ZpjZ+qrfKikYSHCX0?=
 =?us-ascii?Q?1QtChb3dEFpWdzOtatRZzYSp/9ULQLoCchDsspJDjgkBC1RINHGf2Dqj+5rc?=
 =?us-ascii?Q?P+5tjPVE/v6acJ2lOfrj7jYz0Owm+AVy9U7KP62ueGKhTfNzvtLuaF2S+u4T?=
 =?us-ascii?Q?kKnsvagCatdig2vwKokPbwQk9VgX1Gb7u9YY0Ay/YpUS3MGG00gM8qnr8Co9?=
 =?us-ascii?Q?fS/BSJduxshxgWlR95zCMGrf7KauX7IuHH5/Ukb+QwElyjYBcpMQEKr3pYLo?=
 =?us-ascii?Q?2kQtbh9/unt3DlRRwCfkbSel1P9cP5Awufk5S7txJ0hGC6KnAPki6HYD3tVs?=
 =?us-ascii?Q?AWv6M5Fyy9OI7hOo7Bf0IXKbDmIZuOKSB1LDZgjEDFofrKn0Zx/BQZh6tcQm?=
 =?us-ascii?Q?1FnSRsLRMJrfY7KQS3BYlInbvQ7EjL+kUTRr40G0Jpl1vfIM0oCWCsdPuaeH?=
 =?us-ascii?Q?FJZTsZvdAMnSs2LIyXtdkGXPwv9SIeqeu75GfUYKcqbEnTjuUA5OLbmWfgJu?=
 =?us-ascii?Q?+zdJjzdCuZs1SWGZUEmfxeUKZFUShwTG5LC6piAa9LO0RysOeaXHCD/suyHX?=
 =?us-ascii?Q?74iQrkaosqZrVv3TSBzitHNeYkhgzrNpjcKxudJRe6AARM/glN0bEN+9Yfm0?=
 =?us-ascii?Q?s9fwjaVIkf7vL23sGSlhFvH9ftL6SghqlLNds859wUni2A3y33wVc1UmRq/k?=
 =?us-ascii?Q?X2JCP9Z1HL3N7IKBT3yv31uAc86A3HIIoCo3Bejxa71jMKPhi0wMcl6mjNuB?=
 =?us-ascii?Q?XMKe4380ae0bFjLffvmMNXemVONuWzI3B6qsDGVn?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c44edb7-94cc-4000-e6d4-08dc81b4f280
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2024 21:02:14.4004
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: K7FTN15LBo7Y5x7t61ZKpmaLSRsfrELfacmp5t8rme7l2aREtbe+BsZ/UvVP55yfix/c54x+PUtuMFHWCg8ltA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9232

The 'idle' in fsl_chan is redundant as it's equivalent to
'status != DMA_IN_PROGRESS'. So remote it to simple code logic.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.c | 6 +-----
 drivers/dma/fsl-edma-common.h | 2 --
 drivers/dma/fsl-edma-main.c   | 3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index 91a4c11b7cbfd..e31dcc127708d 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -59,7 +59,6 @@ void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan)
 		vchan_cookie_complete(&fsl_chan->edesc->vdesc);
 		fsl_chan->edesc = NULL;
 		fsl_chan->status = DMA_COMPLETE;
-		fsl_chan->idle = true;
 	} else {
 		vchan_cyclic_callback(&fsl_chan->edesc->vdesc);
 	}
@@ -239,7 +238,7 @@ int fsl_edma_terminate_all(struct dma_chan *chan)
 	spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
 	fsl_edma_disable_request(fsl_chan);
 	fsl_chan->edesc = NULL;
-	fsl_chan->idle = true;
+	fsl_chan->status = DMA_COMPLETE;
 	vchan_get_all_descriptors(&fsl_chan->vchan, &head);
 	spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
 	vchan_dma_desc_free_list(&fsl_chan->vchan, &head);
@@ -259,7 +258,6 @@ int fsl_edma_pause(struct dma_chan *chan)
 	if (fsl_chan->edesc) {
 		fsl_edma_disable_request(fsl_chan);
 		fsl_chan->status = DMA_PAUSED;
-		fsl_chan->idle = true;
 	}
 	spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
 	return 0;
@@ -274,7 +272,6 @@ int fsl_edma_resume(struct dma_chan *chan)
 	if (fsl_chan->edesc) {
 		fsl_edma_enable_request(fsl_chan);
 		fsl_chan->status = DMA_IN_PROGRESS;
-		fsl_chan->idle = false;
 	}
 	spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags);
 	return 0;
@@ -780,7 +777,6 @@ void fsl_edma_xfer_desc(struct fsl_edma_chan *fsl_chan)
 	fsl_edma_set_tcd_regs(fsl_chan, fsl_chan->edesc->tcd[0].vtcd);
 	fsl_edma_enable_request(fsl_chan);
 	fsl_chan->status = DMA_IN_PROGRESS;
-	fsl_chan->idle = false;
 }
 
 void fsl_edma_issue_pending(struct dma_chan *chan)
diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index c5a766da02b88..b846cfe0a7fc6 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -150,7 +150,6 @@ struct fsl_edma_chan {
 	struct virt_dma_chan		vchan;
 	enum dma_status			status;
 	enum fsl_edma_pm_state		pm_state;
-	bool				idle;
 	struct fsl_edma_engine		*edma;
 	struct fsl_edma_desc		*edesc;
 	struct dma_slave_config		cfg;
@@ -456,7 +455,6 @@ static inline struct fsl_edma_desc *to_fsl_edma_desc(struct virt_dma_desc *vd)
 static inline void fsl_edma_err_chan_handler(struct fsl_edma_chan *fsl_chan)
 {
 	fsl_chan->status = DMA_ERROR;
-	fsl_chan->idle = true;
 }
 
 void fsl_edma_tx_chan_handler(struct fsl_edma_chan *fsl_chan);
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 82ac56be2d832..af05166ed251f 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -544,7 +544,6 @@ static int fsl_edma_probe(struct platform_device *pdev)
 		fsl_chan->edma = fsl_edma;
 		fsl_chan->pm_state = RUNNING;
 		fsl_chan->srcid = 0;
-		fsl_chan->idle = true;
 		fsl_chan->dma_dir = DMA_NONE;
 		fsl_chan->vchan.desc_free = fsl_edma_free_desc;
 
@@ -669,7 +668,7 @@ static int fsl_edma_suspend_late(struct device *dev)
 			continue;
 		spin_lock_irqsave(&fsl_chan->vchan.lock, flags);
 		/* Make sure chan is idle or will force disable. */
-		if (unlikely(!fsl_chan->idle)) {
+		if (unlikely(fsl_chan->status == DMA_IN_PROGRESS)) {
 			dev_warn(dev, "WARN: There is non-idle channel.");
 			fsl_edma_disable_request(fsl_chan);
 			fsl_edma_chan_mux(fsl_chan, 0, false);
-- 
2.34.1