Received-SPF: pass (google.com: domain of linux-kernel+bounces-112390-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: Sat, 23 Mar 2024 11:34:50 -0400
Subject: [PATCH v3 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: <20240323-8ulp_edma-v3-1-c0e981027c05@nxp.com>
References: <20240323-8ulp_edma-v3-0-c0e981027c05@nxp.com>
In-Reply-To: <20240323-8ulp_edma-v3-0-c0e981027c05@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?VG5IOWpDcTB2a2h1VFJjOFFkNGJySDIzTE1FMys5SSthTTJXc1c4YStPRUov?=
 =?utf-8?B?ZERrYmFrbEdmSkozME1LcHlWaUNOaXB1MnQ2NzBYa2lMa2Y2UGIxVG5BbU90?=
 =?utf-8?B?aVR2cklta203aFBkZ3A3V2sxUWpZc1dYNm1QcEF5TUx1ZUh1WVZsTkQza2xt?=
 =?utf-8?B?Qy80TjVWYkV5bzIzajBSME5KSFBvMW8zb2Q2WW9NLzJPSzU1K2EwUzZTVGZT?=
 =?utf-8?B?RThRSmN2WDVWbEJCalc2eVNKWm1WdWhnZEorblZBY2pCeWs5cnI5b3R6UHhF?=
 =?utf-8?B?ZFlCbVI4QmdYNnh2a0puVGlZdnZQM2ozWE84ZUh6SUJsSnBmMVdnWFdVK0R0?=
 =?utf-8?B?RElucEpkU1FkbWxVbmJlTW5NdUQyQTdyWkdRSmp2K1NkSWRGRHdwYlRzSGpO?=
 =?utf-8?B?eEZReHEzQmJoR1NCb1FlNUpZTlZRZS9GRE1KQWFmUkR6QXhnWWhJYkFPekw0?=
 =?utf-8?B?azJkZjUvK3FlOXNEcHRKaFA3MW5GeHA5WE5jb05jZFc2Y05mbXhWamc1TlJP?=
 =?utf-8?B?N2ZodDVpNXJXVmZvR2txYWM1RGRNemxjd0Z3RGdJcUxheS90aU1maTZoMXdr?=
 =?utf-8?B?TCsweGJ0UXdqdjZIbngwcVJPWWViRDNjaFRrREczMGZobCt6L2E0cVk0cFFB?=
 =?utf-8?B?Y3NmSE4vWVUycVBZVlcwcnlXOVh2amlDQVczdHh1SHA3endZa1hlRkg4WDhT?=
 =?utf-8?B?MUxoZEhOTWpVV0JGZ0dUZUc3OS9uSXcvbHFZdGdEUERDYTFNN2pQMVcyTnhi?=
 =?utf-8?B?em5PcDlWN05Pc3lFVDl4S2VHVUxXSm1LM3pUbUFVdEV2Z2hvN3RqOUhMbXpC?=
 =?utf-8?B?NnYwN2dteEQxRHJPUVpITDAyWHRYazBYTnU4dTV6VVhIRDFDY1h1b0haNkFT?=
 =?utf-8?B?eWg1RWk2dmQ1SnFJNkRaREFJOUhsa0kxdVN1ZUhBUUxaUEJYQnhSQWlNWlZs?=
 =?utf-8?B?VUVtanpGRitLWnhLL0ZsNEppY2J3b1B2RDhqTHcxUTdhMnBtQ0dSMlF1WG83?=
 =?utf-8?B?Rlg5Q2pCV1dwOHZGN2JmOWZmclE2QjJCbjRTQjNQMjQzdjJkdjRGZ001RnBr?=
 =?utf-8?B?Z2Ywb3FvQ0U5TjNnMzh6NTBXVkJPTDhWbmFNWlozWEpteHBIbUd5K2ZGRU1v?=
 =?utf-8?B?VTBsd0s0eWhnNExvcTZBbnV2cDNLWHZ2V3E0amptMXJLeHJMRTk1aVlWWFRu?=
 =?utf-8?B?YmFyRnY3cGpDMGIyQ04zYUVzT2VmbFc1eXZIUFd4MkkrUUYwODVIbjdmNTlC?=
 =?utf-8?B?KzRYcGU4dy9QWmNkeUFqU1ZNTjBKK1cvRjhBMVQ4MmY2L0wwT3lqTi9xT2dS?=
 =?utf-8?B?U3FkVDhsSFZkSnZScStvUzRJS3lBQVViY3JUS0VQeDQ0V0RuU1ltS1IrUzc1?=
 =?utf-8?B?MHoyVEY3djVZeFFnWmxlczd6QVhldDFMaGVaL2dib2pBNnVVZ3JUZE84SG5l?=
 =?utf-8?B?MHY5ekdleVdSZXVXcDE5S1AyZVJ5aExiM3VQZDhWb01KNHc1WmlVSm1WQUVM?=
 =?utf-8?B?S0E1QjJWNnlJVktzS3pVbXpTVlh6MEp5OEdWeVkwNGxWTlpNa2N3L1ZnTjBw?=
 =?utf-8?B?eWRadkdCdW11UDJ3dHJETlJralk5NlNyb3F5NkJaODY4bm11dE1iZzBFYWlV?=
 =?utf-8?B?TzhMamRWYTdzVWhmYlZMUXlsVHRRTWt6d3JWT0wzSVFkMmhHK0ZvV05aeWVy?=
 =?utf-8?B?VWJucUFnWnc4VlJBRkY1TFk3UzJWNWE0RmpJeEI1cmoyRk5aR25tNHE3cnFH?=
 =?utf-8?B?c1l3RXJlZWQ5YmZLZC9vTlI0QjVLSXVsdDI5ZkVZYzZ5V0xhTnhOelRpRVEv?=
 =?utf-8?B?dStEQjdaTVlXVlFZaDV4U21RNEpMSVZjeXFreFZjMWZ5cGRPMGZITWNhSEZ0?=
 =?utf-8?B?QXkvRVI3VXFnbTdORVhaNGRpUm1CMXByMTN5cXRPbzVOSm1DY29pSDBHZWVW?=
 =?utf-8?B?OEFidEJ6TnlOTGpDclpuWU5FWDdvN0U3WnRXaVhTNlpXdWpnRitFUUs3a3Bh?=
 =?utf-8?B?QUdTRThXZGV5OXd6cURNLzNjWWJ2VDhweVVKWDZObHhSRHA4T0Mrd0RaU2Z3?=
 =?utf-8?B?R1FucVMrdmlULzNTdnhPbWluaUpNeDB0OTM5cUo3ZUNmWjlic3owQVBQc2p3?=
 =?utf-8?Q?oETofzXyHQVHDgb1baMyNy0/K?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a38658ed-79b5-48a4-6629-08dc4b4ed7c2
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 15:35:17.9813
 (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: mfKTaojHNzbp21yBb7apmnlk/GmCmmRTsT7Ne7Kh+fvDIACzLglBBHjjnPSrY0Npcy7ouf5ENxMrLNKViJwx/g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7981

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 +++++-----
 drivers/dma/mcf-edma-main.c   |  4 ++--
 3 files changed, 7 insertions(+), 8 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))
diff --git a/drivers/dma/mcf-edma-main.c b/drivers/dma/mcf-edma-main.c
index dba6317838767..78c606f6d0026 100644
--- a/drivers/dma/mcf-edma-main.c
+++ b/drivers/dma/mcf-edma-main.c
@@ -195,7 +195,7 @@ static int mcf_edma_probe(struct platform_device *pdev)
 		struct fsl_edma_chan *mcf_chan = &mcf_edma->chans[i];
 
 		mcf_chan->edma = mcf_edma;
-		mcf_chan->slave_id = i;
+		mcf_chan->srcid = i;
 		mcf_chan->idle = true;
 		mcf_chan->dma_dir = DMA_NONE;
 		mcf_chan->vchan.desc_free = fsl_edma_free_desc;
@@ -277,7 +277,7 @@ bool mcf_edma_filter_fn(struct dma_chan *chan, void *param)
 	if (chan->device->dev->driver == &mcf_edma_driver.driver) {
 		struct fsl_edma_chan *mcf_chan = to_fsl_edma_chan(chan);
 
-		return (mcf_chan->slave_id == (uintptr_t)param);
+		return (mcf_chan->srcid == (uintptr_t)param);
 	}
 
 	return false;

-- 
2.34.1