Received-SPF: pass (google.com: domain of linux-kernel+bounces-83705-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>
Date: Tue, 27 Feb 2024 12:21:53 -0500
Subject: [PATCH 1/5] dmaengine: fsl-edma: remove 'slave_id' from
 fsl_edma_chan
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240227-8ulp_edma-v1-1-7fcfe1e265c2@nxp.com>
References: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com>
In-Reply-To: <20240227-8ulp_edma-v1-0-7fcfe1e265c2@nxp.com>
To: Vinod Koul <vkoul@kernel.org>, Rob Herring <robh@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Peng Fan <peng.fan@nxp.com>
Cc: imx@lists.linux.dev, dmaengine@vger.kernel.org, 
 linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, 
 Frank Li <Frank.Li@nxp.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?d0lZTU5kNHBaYURRa2lIOW4zd1BlU1lNbXpvYlAvZDVDc1lmZkhhbG5GMEtN?=
 =?utf-8?B?aVpGNk1YMFpkejRjZHRlTmlJb3RPeEFPS2U2cTVtTjRNbUE4SlM0V2Y4cTkz?=
 =?utf-8?B?UjNHeklTOElhSDZzZFBoVUNJQVl0aEp4dkYzRFFNOHduT0Q1ZGtJQ2NoY3Fj?=
 =?utf-8?B?UkE2cFZnblYwdzZybGdBN0xuRlpqM1hJSElUR2NTQVpUQW5YS2JRU01qMk1n?=
 =?utf-8?B?MFNnaGlydG92NWtNZm5FOHZaSFhRVFRoSUpqVS9MMkVuV3lZWGN0bk9vUU9H?=
 =?utf-8?B?R3pxNlllYXl6UHV1UzF4akg2d2V2YkR4cnlCWnNiT0o4dkVlVy9KclhoenRp?=
 =?utf-8?B?VlQ4UHZIR01Edk9YekhNRGphMDNkN2tJU0plaTEzbHViN0RmZVU3UktselhN?=
 =?utf-8?B?alc1SjdVa05aeEVjdHk0UzQvTjJJdDRBaGUwRE9pRnh1S1VTU0NzVE9tOXJO?=
 =?utf-8?B?MFhzTVMzeSsxbXU5MkpTbUFyZTd3cDJJTnZXd0tGaVhpM2NzRG1wMjM4Y1Bi?=
 =?utf-8?B?NkYvWnI1RTI5N1BYcmNYYzJ4dWpway93WjJwQXV1eVY2NGFucHBpWXVWcndI?=
 =?utf-8?B?Zmt6RzJ3YTd2czRWNXpucFhiTnBEZ2RPWUt6TEcwU0drOTh0VGRZSDUwdENQ?=
 =?utf-8?B?NkNYVEdvYmtXKy81U1Q0N1RjdXhnMHVGNng0Njd4M3JHVU9IQ3lpMmNRdnox?=
 =?utf-8?B?blhsZHVnMTR6YWpsUlpCb0Y4TVR1bTB6Z1F2eVdONkxmdWd5OFlUU1lid1dD?=
 =?utf-8?B?NU44SXkwZ01meEpwS3FwSUQzcWZrUVFyZFU3dUx4NHlXT0Yveng2RzQzK01E?=
 =?utf-8?B?R21ocE1MSWY1UmIyajRoQ3ZhMHBKVzcvT0xYdjA0UkxySy9EdlArRVo5Uit1?=
 =?utf-8?B?ZHV4YkhSSFpTZ1k0Y2J2SFg4ODBSa1JUQlBRajhIQTkvejZxNFJOSTdqWVp3?=
 =?utf-8?B?QzU4UG5INnFGZXg4b0NId2pMNVMwZUNKaU9uSDB4RjhBTGhLNmQ0K01iR21y?=
 =?utf-8?B?UUVEdU5mdVFrZmRrQXN0bHJ0a3l2VWN1UE9BZlk0SzlNN0N6VW9rK2xwSExj?=
 =?utf-8?B?TmhpUHFwQ29GRDRyd2FqOTJNTHJ2TG9DdGl5eHkrdHJJMUhFL2FJSDlmZkJw?=
 =?utf-8?B?NGw4K1hERjUvMHptaWd3dmZWcjdjRklLWnNFVFRWZlduNnQ5UGpjck81V3Jw?=
 =?utf-8?B?VTlSOFN3ejJRcXlsa1JIckFkc3ROVEtQcnhTOGg2eWhGdmw2UjFVWUpaTm91?=
 =?utf-8?B?L3gxSkRvU2xrUno4MVB1UUQvSnhzbWU4S0pQOStOT25lT0VaaVhtbVNIRVB6?=
 =?utf-8?B?TUxScEtaSE9JL3JnMXVSVWxsWklJaFlGNW1KcERiTlluQnFPTmV6cDlyZVdl?=
 =?utf-8?B?SCtKTlg1YXpSd3I4TWwzalNqcVNkRUlkVHRHQ3Z3Ti9HNm9iblp6b1BsLzBR?=
 =?utf-8?B?RlpJcU9YWDRXUVpTV1FwN2tjaitDYWJNYUY3MTgvMXpaUDdtdlphWnN3Y0Jr?=
 =?utf-8?B?enhaSThoM0Urd3g4NldHMm5FQXZXVzdCWnZidVBySTg5bTQxVkYrWjVzUXZF?=
 =?utf-8?B?V2kzRTV0cTFPbXo5N0sxaFVrQldOU0JtK0hGZ0dBTlZ3enZMNWdWWlZBTndt?=
 =?utf-8?B?amo3dGVQYzRCN2gwSGEyZDhEY3JTREVGV0JCcnZYTkFTbUNJa1d4SUdXSG5w?=
 =?utf-8?B?WjViQ0hzVGVLZEEyaCs5S3Y5WWtMU3c4UnpRbGN2UUhZMHM4RWRVZGg2Q3M4?=
 =?utf-8?B?MmRsMWErRjg5QlRqaVMxYVBjUDBWMHYyOERnNFBWT3hzT1piTStiUmcvTFpS?=
 =?utf-8?B?RHF6a0tNZkdvaUJ6QzBtaE1ncVhITlZCd2dtOVhreWUzN2FvR1ZTZ21BeW02?=
 =?utf-8?B?dllwNFRVRHB3Tmtwak9nRzBhcGtROEtRN0tyMUVhYmF2SVNoeUgrTUozang0?=
 =?utf-8?B?YSt0OGtEbFM3R3J2b25qN1VGNWw2S3NJZ0Y5dFNuVzkzMTdOTktuaDdBZ3Rh?=
 =?utf-8?B?a1ZTRGxaczhHVVJmbEIwbnoxMFg3YlF1N2hITjZKaVNaN2tWcjQxVk9UNXhl?=
 =?utf-8?B?a29KZ0R1ak9uQWNoRnVrcjFFWlkzTWhMU3grVVFqdThBRGVtTWUvek0vSWxq?=
 =?utf-8?Q?dn8Q=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4493227c-4ded-4eeb-569f-08dc37b8a42a
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 17:22:14.8440
 (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: PdjXTUgGbVcb9qOL8xGCo15KngQV2ZqVIQQbJqqlkQYQB3Lbzg1gbJ8J15539chboxGbz4FBvN/N4sbJlbKcFg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS5PR04MB9754

The 'slave_id' field is redundant as it duplicates the functionality of
'srcid'. Remove 'slave_id' from fsl_edma_chan to eliminate redundancy.

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

diff --git a/drivers/dma/fsl-edma-common.h b/drivers/dma/fsl-edma-common.h
index 7bf0aba471a8c..4cf1de9f0e512 100644
--- a/drivers/dma/fsl-edma-common.h
+++ b/drivers/dma/fsl-edma-common.h
@@ -151,7 +151,6 @@ struct fsl_edma_chan {
 	enum dma_status			status;
 	enum fsl_edma_pm_state		pm_state;
 	bool				idle;
-	u32				slave_id;
 	struct fsl_edma_engine		*edma;
 	struct fsl_edma_desc		*edesc;
 	struct dma_slave_config		cfg;
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 402f0058a180c..0a6e0c4040274 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -114,8 +114,8 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
 			if (chan) {
 				chan->device->privatecnt++;
 				fsl_chan = to_fsl_edma_chan(chan);
-				fsl_chan->slave_id = dma_spec->args[1];
-				fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id,
+				fsl_chan->srcid = dma_spec->args[1];
+				fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid,
 						true);
 				mutex_unlock(&fsl_edma->fsl_edma_mutex);
 				return chan;
@@ -540,7 +540,7 @@ static int fsl_edma_probe(struct platform_device *pdev)
 
 		fsl_chan->edma = fsl_edma;
 		fsl_chan->pm_state = RUNNING;
-		fsl_chan->slave_id = 0;
+		fsl_chan->srcid = 0;
 		fsl_chan->idle = true;
 		fsl_chan->dma_dir = DMA_NONE;
 		fsl_chan->vchan.desc_free = fsl_edma_free_desc;
@@ -682,8 +682,8 @@ static int fsl_edma_resume_early(struct device *dev)
 			continue;
 		fsl_chan->pm_state = RUNNING;
 		edma_write_tcdreg(fsl_chan, 0, csr);
-		if (fsl_chan->slave_id != 0)
-			fsl_edma_chan_mux(fsl_chan, fsl_chan->slave_id, true);
+		if (fsl_chan->srcid != 0)
+			fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid, true);
 	}
 
 	if (!(fsl_edma->drvdata->flags & FSL_EDMA_DRV_SPLIT_REG))

-- 
2.34.1