mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-04 06:49:45 -04:00
net: stmmac: dwmac-visconti: Make visconti_eth_clock_remove() return void
The function returns zero unconditionally. Change it to return void instead which simplifies one caller as error handing becomes unnecessary. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Reviewed-by: Simon Horman <simon.horman@corigine.com> Acked-by: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp> Reviewed-by: Michal Kubiak <michal.kubiak@intel.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
3246627f11
commit
b9bc44fe06
@@ -198,7 +198,7 @@ static int visconti_eth_clock_probe(struct platform_device *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int visconti_eth_clock_remove(struct platform_device *pdev)
|
||||
static void visconti_eth_clock_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct visconti_eth *dwmac = get_stmmac_bsp_priv(&pdev->dev);
|
||||
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||
@@ -206,8 +206,6 @@ static int visconti_eth_clock_remove(struct platform_device *pdev)
|
||||
|
||||
clk_disable_unprepare(dwmac->phy_ref_clk);
|
||||
clk_disable_unprepare(priv->plat->stmmac_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int visconti_eth_dwmac_probe(struct platform_device *pdev)
|
||||
@@ -263,17 +261,14 @@ static int visconti_eth_dwmac_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct net_device *ndev = platform_get_drvdata(pdev);
|
||||
struct stmmac_priv *priv = netdev_priv(ndev);
|
||||
int err;
|
||||
|
||||
stmmac_pltfr_remove(pdev);
|
||||
|
||||
err = visconti_eth_clock_remove(pdev);
|
||||
if (err < 0)
|
||||
dev_err(&pdev->dev, "failed to remove clock: %d\n", err);
|
||||
visconti_eth_clock_remove(pdev);
|
||||
|
||||
stmmac_remove_config_dt(pdev, priv->plat);
|
||||
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id visconti_eth_dwmac_match[] = {
|
||||
|
||||
Reference in New Issue
Block a user