[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20241218032230.117453-3-joe@pf.is.s.u-tokyo.ac.jp>
Date: Wed, 18 Dec 2024 12:22:30 +0900
From: Joe Hattori <joe@...is.s.u-tokyo.ac.jp>
To: alexandre.torgue@...s.st.com,
joabreu@...opsys.com,
andrew+netdev@...n.ch,
davem@...emloft.net,
edumazet@...gle.com,
kuba@...nel.org,
pabeni@...hat.com,
mcoquelin.stm32@...il.com
Cc: krzk@...nel.org,
dan.carpenter@...aro.org,
netdev@...r.kernel.org,
Joe Hattori <joe@...is.s.u-tokyo.ac.jp>
Subject: [PATCH v2 2/2] net: stmmac: remove the unnecessary argument of stmmac_remove_config_dt()
The first argument of stmmac_remove_config_dt() is not used, so drop it.
Signed-off-by: Joe Hattori <joe@...is.s.u-tokyo.ac.jp>
---
.../ethernet/stmicro/stmmac/stmmac_platform.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 669d8eb07044..aadacb1d5939 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -407,13 +407,11 @@ static int stmmac_of_get_mac_mode(struct device_node *np)
/**
* stmmac_remove_config_dt - undo the effects of stmmac_probe_config_dt()
- * @pdev: platform_device structure
* @plat: driver data platform structure
*
* Release resources claimed by stmmac_probe_config_dt().
*/
-static void stmmac_remove_config_dt(struct platform_device *pdev,
- struct plat_stmmacenet_data *plat)
+static void stmmac_remove_config_dt(struct plat_stmmacenet_data *plat)
{
clk_disable_unprepare(plat->stmmac_clk);
clk_disable_unprepare(plat->pclk);
@@ -582,7 +580,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
dma_cfg = devm_kzalloc(&pdev->dev, sizeof(*dma_cfg),
GFP_KERNEL);
if (!dma_cfg) {
- stmmac_remove_config_dt(pdev, plat);
+ stmmac_remove_config_dt(plat);
return ERR_PTR(-ENOMEM);
}
plat->dma_cfg = dma_cfg;
@@ -611,7 +609,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
rc = stmmac_mtl_setup(pdev, plat);
if (rc) {
- stmmac_remove_config_dt(pdev, plat);
+ stmmac_remove_config_dt(plat);
return ERR_PTR(rc);
}
@@ -628,7 +626,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
plat->pclk = devm_clk_get_optional(&pdev->dev, "pclk");
if (IS_ERR(plat->pclk)) {
- stmmac_remove_config_dt(pdev, plat);
+ stmmac_remove_config_dt(plat);
return ERR_CAST(plat->pclk);
}
clk_prepare_enable(plat->pclk);
@@ -647,14 +645,14 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
plat->stmmac_rst = devm_reset_control_get_optional(&pdev->dev,
STMMAC_RESOURCE_NAME);
if (IS_ERR(plat->stmmac_rst)) {
- stmmac_remove_config_dt(pdev, plat);
+ stmmac_remove_config_dt(plat);
return ERR_CAST(plat->stmmac_rst);
}
plat->stmmac_ahb_rst = devm_reset_control_get_optional_shared(
&pdev->dev, "ahb");
if (IS_ERR(plat->stmmac_ahb_rst)) {
- stmmac_remove_config_dt(pdev, plat);
+ stmmac_remove_config_dt(plat);
return ERR_CAST(plat->stmmac_ahb_rst);
}
@@ -663,10 +661,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac)
static void devm_stmmac_remove_config_dt(void *data)
{
- struct plat_stmmacenet_data *plat = data;
-
- /* Platform data argument is unused */
- stmmac_remove_config_dt(NULL, plat);
+ stmmac_remove_config_dt(data);
}
/**
--
2.34.1
Powered by blists - more mailing lists