On Fri, Aug 23, 2024 at 01:21:13AM -0600, Yangtao Li wrote:
> Convert devm_clk_get(), clk_prepare_enable() to a single
> call to devm_clk_get_enabled(), as this is exactly
> what this function does.
>
> Signed-off-by: Yangtao Li <frank.li@xxxxxxxx>
> Reviewed-by: Maxime Chevallier <maxime.chevallier@xxxxxxxxxxx>
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> index d68f0c4e7835..dcbae653ab8c 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel-plat.c
> @@ -104,12 +104,10 @@ static int intel_eth_plat_probe(struct platform_device *pdev)
>
> /* Enable TX clock */
> if (dwmac->data->tx_clk_en) {
> - dwmac->tx_clk = devm_clk_get(&pdev->dev, "tx_clk");
> + dwmac->tx_clk = devm_clk_get_enabled(&pdev->dev, "tx_clk");
As it looks like there will be a v3 anyway, a minor nit from my side:
IMHO, the line above could be trivially wrapped to keep it <= 80 columns wide,
which is still preferred by Networking code.
> if (IS_ERR(dwmac->tx_clk))
> return PTR_ERR(dwmac->tx_clk);
>
> - clk_prepare_enable(dwmac->tx_clk);
> -
> /* Check and configure TX clock rate */
> rate = clk_get_rate(dwmac->tx_clk);
> if (dwmac->data->tx_clk_rate &&
> @@ -149,20 +147,15 @@ static int intel_eth_plat_probe(struct platform_device *pdev)
> }
>
> ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);
> - if (ret) {
> - clk_disable_unprepare(dwmac->tx_clk);
> + if (ret)
> return ret;
> - }
>
> return 0;
> }
>
> static void intel_eth_plat_remove(struct platform_device *pdev)
> {
> - struct intel_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);
> -
> stmmac_pltfr_remove(pdev);
> - clk_disable_unprepare(dwmac->tx_clk);
> }
>
> static struct platform_driver intel_eth_plat_driver = {
> --
> 2.39.0
>
