Dne sobota, 16. september 2023 ob 09:58:25 CEST je Jisheng Zhang napisal(a):
> Simplify the driver's probe() function by using the devres
> variant of stmmac_probe_config_dt().
>
> The remove_new() callback now needs to be switched to
> stmmac_pltfr_remove_no_dt().
>
> Signed-off-by: Jisheng Zhang <jszhang@xxxxxxxxxx>
Reviewed-by: Jernej Skrabec <jernej.skrabec@xxxxxxxxx>
Best regards,
Jernej
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 25 +++++++------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c index
> beceeae579bf..b857235f5b1f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c
> @@ -108,36 +108,31 @@ static int sun7i_gmac_probe(struct platform_device
> *pdev) if (ret)
> return ret;
>
> - plat_dat = stmmac_probe_config_dt(pdev, stmmac_res.mac);
> + plat_dat = devm_stmmac_probe_config_dt(pdev, stmmac_res.mac);
> if (IS_ERR(plat_dat))
> return PTR_ERR(plat_dat);
>
> gmac = devm_kzalloc(dev, sizeof(*gmac), GFP_KERNEL);
> - if (!gmac) {
> - ret = -ENOMEM;
> - goto err_remove_config_dt;
> - }
> + if (!gmac)
> + return -ENOMEM;
>
> ret = of_get_phy_mode(dev->of_node, &gmac->interface);
> if (ret && ret != -ENODEV) {
> dev_err(dev, "Can't get phy-mode\n");
> - goto err_remove_config_dt;
> + return ret;
> }
>
> gmac->tx_clk = devm_clk_get(dev, "allwinner_gmac_tx");
> if (IS_ERR(gmac->tx_clk)) {
> dev_err(dev, "could not get tx clock\n");
> - ret = PTR_ERR(gmac->tx_clk);
> - goto err_remove_config_dt;
> + return PTR_ERR(gmac->tx_clk);
> }
>
> /* Optional regulator for PHY */
> gmac->regulator = devm_regulator_get_optional(dev, "phy");
> if (IS_ERR(gmac->regulator)) {
> - if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER) {
> - ret = -EPROBE_DEFER;
> - goto err_remove_config_dt;
> - }
> + if (PTR_ERR(gmac->regulator) == -EPROBE_DEFER)
> + return -EPROBE_DEFER;
> dev_info(dev, "no regulator found\n");
> gmac->regulator = NULL;
> }
> @@ -155,7 +150,7 @@ static int sun7i_gmac_probe(struct platform_device
> *pdev)
>
> ret = sun7i_gmac_init(pdev, plat_dat->bsp_priv);
> if (ret)
> - goto err_remove_config_dt;
> + return ret;
>
> ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
> if (ret)
> @@ -165,8 +160,6 @@ static int sun7i_gmac_probe(struct platform_device
> *pdev)
>
> err_gmac_exit:
> sun7i_gmac_exit(pdev, plat_dat->bsp_priv);
> -err_remove_config_dt:
> - stmmac_remove_config_dt(pdev, plat_dat);
>
> return ret;
> }
> @@ -179,7 +172,7 @@ MODULE_DEVICE_TABLE(of, sun7i_dwmac_match);
>
> static struct platform_driver sun7i_dwmac_driver = {
> .probe = sun7i_gmac_probe,
> - .remove_new = stmmac_pltfr_remove,
> + .remove_new = stmmac_pltfr_remove_no_dt,
> .driver = {
> .name = "sun7i-dwmac",
> .pm = &stmmac_pltfr_pm_ops,
