iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: stmmac: dwc-qos: Make struct dwc_eth_dwmac_data::remove return void

Browse Source 
All implementations of the remove callback return 0 unconditionally. So
in dwc_eth_dwmac_remove() there is no error handling necessary. Simplify
accordingly.

This is a preparation for making struct platform_driver::remove return
void, too.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20230211112431.214252-2-u.kleine-koenig@pengutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Uwe Kleine-König 2023-02-11 12:24:31 +01:00 committed by Jakub Kicinski
parent ff0011cf56
commit 1a940b0001
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
View File

@ -159,15 +159,13 @@ disable:
return err;
}
static int dwc_qos_remove(struct platform_device *pdev)
static void dwc_qos_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct stmmac_priv *priv = netdev_priv(ndev);
clk_disable_unprepare(priv->plat->pclk);
clk_disable_unprepare(priv->plat->stmmac_clk);
return 0;
}
#define SDMEMCOMPPADCTRL 0x8800
@ -384,7 +382,7 @@ error:
return err;
}
static int tegra_eqos_remove(struct platform_device *pdev)
static void tegra_eqos_remove(struct platform_device *pdev)
{
struct tegra_eqos *eqos = get_stmmac_bsp_priv(&pdev->dev);
@ -394,15 +392,13 @@ static int tegra_eqos_remove(struct platform_device *pdev)
clk_disable_unprepare(eqos->clk_rx);
clk_disable_unprepare(eqos->clk_slave);
clk_disable_unprepare(eqos->clk_master);
return 0;
}
struct dwc_eth_dwmac_data {
int (*probe)(struct platform_device *pdev,
struct plat_stmmacenet_data *data,
struct stmmac_resources *res);
int (*remove)(struct platform_device *pdev);
void (*remove)(struct platform_device *pdev);
};
static const struct dwc_eth_dwmac_data dwc_qos_data = {
@ -473,19 +469,16 @@ static int dwc_eth_dwmac_remove(struct platform_device *pdev)
struct net_device *ndev = platform_get_drvdata(pdev);
struct stmmac_priv *priv = netdev_priv(ndev);
const struct dwc_eth_dwmac_data *data;
int err;
data = device_get_match_data(&pdev->dev);
stmmac_dvr_remove(&pdev->dev);
err = data->remove(pdev);
if (err < 0)
dev_err(&pdev->dev, "failed to remove subdriver: %d\n", err);
data->remove(pdev);
stmmac_remove_config_dt(pdev, priv->plat);
return err;
return 0;
}
static const struct of_device_id dwc_eth_dwmac_match[] = {