korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

net: arc: Make arc_emac_remove() return void

Browse Source 
The function returns zero unconditionally. Change it to return void instead
which simplifies its callers 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Uwe Kleine-König 2023-05-18 22:30:49 +02:00 committed by David S. Miller
parent 640c48a088
commit 20d5e0ef25
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/arc/emac.h
View File

@ -220,6 +220,6 @@ static inline void arc_reg_clr(struct arc_emac_priv *priv, int reg, int mask)
int arc_mdio_probe(struct arc_emac_priv *priv);
int arc_mdio_remove(struct arc_emac_priv *priv);
int arc_emac_probe(struct net_device *ndev, int interface);
int arc_emac_remove(struct net_device *ndev);
void arc_emac_remove(struct net_device *ndev);
#endif /* ARC_EMAC_H */

6
drivers/net/ethernet/arc/emac_arc.c
View File

@ -61,11 +61,11 @@ out_netdev:
static int emac_arc_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
int err;
err = arc_emac_remove(ndev);
arc_emac_remove(ndev);
free_netdev(ndev);
return err;
return 0;
}
static const struct of_device_id emac_arc_dt_ids[] = {

4
drivers/net/ethernet/arc/emac_main.c
View File

@ -1008,7 +1008,7 @@ out_put_node:
}
EXPORT_SYMBOL_GPL(arc_emac_probe);
int arc_emac_remove(struct net_device *ndev)
void arc_emac_remove(struct net_device *ndev)
{
struct arc_emac_priv *priv = netdev_priv(ndev);
@ -1019,8 +1019,6 @@ int arc_emac_remove(struct net_device *ndev)
if (!IS_ERR(priv->clk))
clk_disable_unprepare(priv->clk);
return 0;
}
EXPORT_SYMBOL_GPL(arc_emac_remove);

5
drivers/net/ethernet/arc/emac_rockchip.c
View File

@ -248,9 +248,8 @@ static int emac_rockchip_remove(struct platform_device *pdev)
{
struct net_device *ndev = platform_get_drvdata(pdev);
struct rockchip_priv_data *priv = netdev_priv(ndev);
int err;
err = arc_emac_remove(ndev);
arc_emac_remove(ndev);
clk_disable_unprepare(priv->refclk);
@ -261,7 +260,7 @@ static int emac_rockchip_remove(struct platform_device *pdev)
clk_disable_unprepare(priv->macclk);
free_netdev(ndev);
return err;
return 0;
}
static struct platform_driver emac_rockchip_driver = {