Received-SPF: pass (google.com: domain of linux-kernel+bounces-199357-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)
Cc: imx@lists.linux.dev
Subject: [PATCH v2 2/2] dmaengine: fsl-edma: remove redundant "idle" field from fsl_chan
Date: Mon,  3 Jun 2024 11:23:16 -0400
Message-Id: <20240603152317.69917-2-Frank.Li@nxp.com>
In-Reply-To: <20240603152317.69917-1-Frank.Li@nxp.com>
References: <20240603152317.69917-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?jOqNb8Uk44LaxlZJ7esR4o005aPQJV9AksCcUEghqwtPLtIop+HmEZZ4gjH3?=
 =?us-ascii?Q?n9cvZlVgkAZkVIa2n49Amz/Tx8aAbvv1hcN1w+zAHYRZkiAQ8bR6FhwLeV40?=
 =?us-ascii?Q?grBYSxFU2NU+K+2bSh0NOOIQR68DJpypUQlZjqOIOhYOhks8T+VRc4nIgwZ5?=
 =?us-ascii?Q?RfNWM8aVRpg/qi9zH8pZ/AAbwhoJ1wZOJ1lMNVvFpRScAk9eHdFvi75UzPYA?=
 =?us-ascii?Q?1AAISzOCzRpHMN7v33agyyIpvK81RwrIGqFkr8mqwoXVjKzfUYRwJtWzZ7iv?=
 =?us-ascii?Q?yNr6xlo4ldzHmV9vD+nZ1d3tocjvVvOhXWK8R1yfhQ6qw3XxY3uEZVhTV1SH?=
 =?us-ascii?Q?OZZcqM/GoI208/8yPqXOuJ03+4yodbX45jPpklg1VjaKfg65yBu8vdD9wMbp?=
 =?us-ascii?Q?qxROAVYWuKaqx2HEbyyQFaLWj0lyEB8k5OzfrzCzk40TfroyvYAgErZgphzk?=
 =?us-ascii?Q?c29tO+9EoeBYLcfvc93Q939bvB96ctWxS4aX3mqIkCnMZkGlFO+GdjdEElLx?=
 =?us-ascii?Q?cqub/qGD9rkfUz33TgmEGCpbOVMir5TB+OVIxlJMvLN1bSUReiZcAIloOYQw?=
 =?us-ascii?Q?IOii8VOMVZjovCcNFwqa+e9mCtPjxBLEFQgk9znf0thv1CW/2PslbQHAFACc?=
 =?us-ascii?Q?7QoixeWYPESwTM6kBU60nNEFkZ+9slTplQaAvJiL5drdH8meeUMeIK/Lwqx+?=
 =?us-ascii?Q?bRmPhX41UFYA9Bclq94SwpqBk4qqnjOf2fAN+l5+vo1TOdFvydkTfOfkn9bq?=
 =?us-ascii?Q?NVHnnY82SWF5AQGY13nWLniDWavhpJ5vO2SiwPFTzveK6gPIe8+cGz/wZng3?=
 =?us-ascii?Q?4uDSFey3czNzN58No/H/iaPq7LyWHDidMRHy2K9Kxt4fgy/246/0AE2TI7fW?=
 =?us-ascii?Q?frKb/TIpaMoTy3SVkDzgBICqq/0JIIJ5ZEP/wkN1b20lnNK+i/z3V0IPgzsx?=
 =?us-ascii?Q?996txXJlxMDS0FdALuP6RrTtBQD2SFfA6fA8rgtI3CnUX9WHC9CExQworbPw?=
 =?us-ascii?Q?IqaioPxJZhp616AHKXucA4iJ/wdzZ8P9b2icCranY+6qOFmUDJQOz62XGs5Y?=
 =?us-ascii?Q?odGxEg6VpZyIOsrqjvNoFBcZrCZBzflg6T49m1inGd79TnP9UX0fO9bE0eWE?=
 =?us-ascii?Q?eqsOOuMPiQQSIdcuQ288GG6/jkps9uplxUFEu52KNtNB+3Z+zS7sa6vL6Eyv?=
 =?us-ascii?Q?4WujH+lybItnuux1Ff1M+IYrdCyIxv/Z3f9Cu3EeAvbxI3DYahTbQTUi2yyg?=
 =?us-ascii?Q?5xVjfJLBuus0YtTWwNPoiLQw8+v2w5Ull9pPvgRB8zebvCwGrK1mbETufC4Z?=
 =?us-ascii?Q?09sYbz9jbQLUCengcUbVeGPSK/HA8ZAuw5WtJfN+2lrrVXmkfvYcitKpXd5T?=
 =?us-ascii?Q?RlMgki3+xmNgZsIiNUEqvFIJDom1tW3jGine2mOvlgG9nQ1x2YbPP1bcIhE8?=
 =?us-ascii?Q?RKBCNWSrZYHnXUxG/nuOan8sRBBQFF15/+Njk9zBI6595GtSSmPqIjiKpaJ4?=
 =?us-ascii?Q?G/mZQYlwExSPAyDrreTaswodUxh2ZA49G7fKjeexCLB2jfNIn+e+6D6XCja6?=
 =?us-ascii?Q?QZIeWeC7/kbsTSHQjqsU0qQ5ZCTs4b66D82FKQvD?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 33bec09a-a198-4d57-15d3-08dc83e11ffb
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jun 2024 15:23:30.8382
 (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: 1tfmqG6PXWkaKeSe4wWpWfOCRVd2SUMCNUKYUUv0DowveQcgp9+U6HiZShfd3wE9iGSay3g7CEbmPN5BKLHSeQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR04MB9243

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>
---

Notes:
    Change from v1 to v2
    Remove "idle" at mcf-edma-main.c also to build error found by
    | Reported-by: kernel test robot <lkp@intel.com>
    | Closes: https://lore.kernel.org/oe-kbuild-all/202406011344.s3sPp61I-lkp@intel.com/

 drivers/dma/fsl-edma-common.c | 6 +-----
 drivers/dma/fsl-edma-common.h | 2 --
 drivers/dma/fsl-edma-main.c   | 3 +--
 drivers/dma/mcf-edma-main.c   | 2 --
 4 files changed, 2 insertions(+), 11 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);
diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
index d97991a1e9518..3ceb7b8f9a67d 100644
--- a/drivers/dma/mcf-edma-main.c
+++ b/drivers/dma/mcf-edma-main.c
@@ -64,7 +64,6 @@ static irqreturn_t mcf_edma_err_handler(int irq, void *dev_id)
 			fsl_edma_disable_request(&mcf_edma->chans[ch]);
 			iowrite8(EDMA_CERR_CERR(ch), regs->cerr);
 			mcf_edma->chans[ch].status = DMA_ERROR;
-			mcf_edma->chans[ch].idle = true;
 		}
 	}
 
@@ -196,7 +195,6 @@ static int mcf_edma_probe(struct platform_device *pdev)
 
 		mcf_chan->edma = mcf_edma;
 		mcf_chan->srcid = i;
-		mcf_chan->idle = true;
 		mcf_chan->dma_dir = DMA_NONE;
 		mcf_chan->vchan.desc_free = fsl_edma_free_desc;
 		vchan_init(&mcf_chan->vchan, &mcf_edma->dma_dev);
-- 
2.34.1