Skip to content

Commit

Permalink
net: stmmac: dwmac-tegra: use devm_stmmac_probe_config_dt()
Browse files Browse the repository at this point in the history
Simplify the driver's probe() function by using the devres
variant of stmmac_probe_config_dt().

The calling of stmmac_pltfr_remove() now needs to be switched to
stmmac_pltfr_remove_no_dt().

Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jisheng Zhang authored and David S. Miller committed Sep 18, 2023
1 parent 2915953 commit acf73cc
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ static int tegra_mgbe_probe(struct platform_device *pdev)
if (err < 0)
goto disable_clks;

plat = stmmac_probe_config_dt(pdev, res.mac);
plat = devm_stmmac_probe_config_dt(pdev, res.mac);
if (IS_ERR(plat)) {
err = PTR_ERR(plat);
goto disable_clks;
Expand All @@ -303,7 +303,7 @@ static int tegra_mgbe_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!plat->mdio_bus_data) {
err = -ENOMEM;
goto remove;
goto disable_clks;
}
}

Expand All @@ -321,7 +321,7 @@ static int tegra_mgbe_probe(struct platform_device *pdev)
500, 500 * 2000);
if (err < 0) {
dev_err(mgbe->dev, "timeout waiting for TX lane to become enabled\n");
goto remove;
goto disable_clks;
}

plat->serdes_powerup = mgbe_uphy_lane_bringup_serdes_up;
Expand All @@ -342,12 +342,10 @@ static int tegra_mgbe_probe(struct platform_device *pdev)

err = stmmac_dvr_probe(&pdev->dev, plat, &res);
if (err < 0)
goto remove;
goto disable_clks;

return 0;

remove:
stmmac_remove_config_dt(pdev, plat);
disable_clks:
clk_bulk_disable_unprepare(ARRAY_SIZE(mgbe_clks), mgbe->clks);

Expand All @@ -360,7 +358,7 @@ static void tegra_mgbe_remove(struct platform_device *pdev)

clk_bulk_disable_unprepare(ARRAY_SIZE(mgbe_clks), mgbe->clks);

stmmac_pltfr_remove(pdev);
stmmac_pltfr_remove_no_dt(pdev);
}

static const struct of_device_id tegra_mgbe_match[] = {
Expand Down

0 comments on commit acf73cc

Please sign in to comment.