On Sat, Feb 11, 2023 at 12:24:30PM +0100, Uwe Kleine-König wrote:
> The function returns zero unconditionally. Change it to return void instead
> which simplifies some callers as error handing becomes unnecessary.
>
> This also makes it more obvious that most platform remove callbacks always
> return zero.
Code in both patches looks OK.
Please, specify, which tree this patch should be in (net or net-next).
This is rather a code improvement than a fix, so net-next would be appropriate.
Also, multiple patches usually require a cover letter. The code changes are
trivial, so maybe the best solution would be to just to squash those patches
together.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
> ---
> drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 4 +---
> drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 5 +++--
> drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 5 +++--
> drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 5 +++--
> drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +-
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 +---
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 +++--
> 7 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> index 80efdeeb0b59..87a2c1a18638 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
> @@ -477,9 +477,7 @@ static int dwc_eth_dwmac_remove(struct platform_device *pdev)
>
> data = device_get_match_data(&pdev->dev);
>
> - err = stmmac_dvr_remove(&pdev->dev);
> - if (err < 0)
> - dev_err(&pdev->dev, "failed to remove platform: %d\n", err);
> + stmmac_dvr_remove(&pdev->dev);
>
> err = data->remove(pdev);
> if (err < 0)
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
> index 6656d76b6766..4b8fd11563e4 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
> @@ -1915,11 +1915,12 @@ static int rk_gmac_probe(struct platform_device *pdev)
> static int rk_gmac_remove(struct platform_device *pdev)
> {
> struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(&pdev->dev);
> - int ret = stmmac_dvr_remove(&pdev->dev);
> +
> + stmmac_dvr_remove(&pdev->dev);
>
> rk_gmac_powerdown(bsp_priv);
>
> - return ret;
> + return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
> index 710d7435733e..be3b1ebc06ab 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
> @@ -371,11 +371,12 @@ static int sti_dwmac_probe(struct platform_device *pdev)
> static int sti_dwmac_remove(struct platform_device *pdev)
> {
> struct sti_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);
> - int ret = stmmac_dvr_remove(&pdev->dev);
> +
> + stmmac_dvr_remove(&pdev->dev);
>
> clk_disable_unprepare(dwmac->clk);
>
> - return ret;
> + return 0;
> }
>
> #ifdef CONFIG_PM_SLEEP
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> index 2b38a499a404..0616b3a04ff3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
> @@ -421,9 +421,10 @@ static int stm32_dwmac_remove(struct platform_device *pdev)
> {
> struct net_device *ndev = platform_get_drvdata(pdev);
> struct stmmac_priv *priv = netdev_priv(ndev);
> - int ret = stmmac_dvr_remove(&pdev->dev);
> struct stm32_dwmac *dwmac = priv->plat->bsp_priv;
>
> + stmmac_dvr_remove(&pdev->dev);
> +
> stm32_dwmac_clk_disable(priv->plat->bsp_priv);
>
> if (dwmac->irq_pwr_wakeup >= 0) {
> @@ -431,7 +432,7 @@ static int stm32_dwmac_remove(struct platform_device *pdev)
> device_init_wakeup(&pdev->dev, false);
> }
>
> - return ret;
> + return 0;
> }
>
> static int stm32mp1_suspend(struct stm32_dwmac *dwmac)
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> index bdbf86cb102a..3d15e1e92e18 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
> @@ -345,7 +345,7 @@ int stmmac_xdp_open(struct net_device *dev);
> void stmmac_xdp_release(struct net_device *dev);
> int stmmac_resume(struct device *dev);
> int stmmac_suspend(struct device *dev);
> -int stmmac_dvr_remove(struct device *dev);
> +void stmmac_dvr_remove(struct device *dev);
> int stmmac_dvr_probe(struct device *device,
> struct plat_stmmacenet_data *plat_dat,
> struct stmmac_resources *res);
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index c6951c976f5d..97bcfb628463 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -7341,7 +7341,7 @@ EXPORT_SYMBOL_GPL(stmmac_dvr_probe);
> * Description: this function resets the TX/RX processes, disables the MAC RX/TX
> * changes the link status, releases the DMA descriptor rings.
> */
> -int stmmac_dvr_remove(struct device *dev)
> +void stmmac_dvr_remove(struct device *dev)
> {
> struct net_device *ndev = dev_get_drvdata(dev);
> struct stmmac_priv *priv = netdev_priv(ndev);
> @@ -7377,8 +7377,6 @@ int stmmac_dvr_remove(struct device *dev)
>
> pm_runtime_disable(dev);
> pm_runtime_put_noidle(dev);
> -
> - return 0;
> }
> EXPORT_SYMBOL_GPL(stmmac_dvr_remove);
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index eb6d9cd8e93f..5429531ae7c7 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -711,14 +711,15 @@ int stmmac_pltfr_remove(struct platform_device *pdev)
> struct net_device *ndev = platform_get_drvdata(pdev);
> struct stmmac_priv *priv = netdev_priv(ndev);
> struct plat_stmmacenet_data *plat = priv->plat;
> - int ret = stmmac_dvr_remove(&pdev->dev);
> +
> + stmmac_dvr_remove(&pdev->dev);
>
> if (plat->exit)
> plat->exit(pdev, plat->bsp_priv);
>
> stmmac_remove_config_dt(pdev, plat);
>
> - return ret;
> + return 0;
> }
> EXPORT_SYMBOL_GPL(stmmac_pltfr_remove);
>
>
> base-commit: 1b929c02afd37871d5afb9d498426f83432e71c2
> --
> 2.39.0
>