Commit 403068c6 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: sti: convert to devm_stmmac_pltfr_probe() 



Convert sti to use the generic devm_stmmac_pltfr_probe() which will
call plat_dat->init()/plat_dat->exit() as appropriate, thus
simplifying the code.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1u4jMj-000rCM-31@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 72d02a9f

drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c

+26 −28
Original line number Diff line number Diff line
@@ -233,6 +233,29 @@ static int sti_dwmac_parse_data(struct sti_dwmac *dwmac, 
	return 0;

}



static int sti_dwmac_init(struct platform_device *pdev, void *bsp_priv)

{

	struct sti_dwmac *dwmac = bsp_priv;

	int ret;



	ret = clk_prepare_enable(dwmac->clk);

	if (ret)

		return ret;



	ret = sti_dwmac_set_mode(dwmac);

	if (ret)

		clk_disable_unprepare(dwmac->clk);



	return ret;

}



static void sti_dwmac_exit(struct platform_device *pdev, void *bsp_priv)

{

	struct sti_dwmac *dwmac = bsp_priv;



	clk_disable_unprepare(dwmac->clk);

}



static int sti_dwmac_probe(struct platform_device *pdev)

{

	struct plat_stmmacenet_data *plat_dat;
@@ -269,34 +292,10 @@ static int sti_dwmac_probe(struct platform_device *pdev) 


	plat_dat->bsp_priv = dwmac;

	plat_dat->fix_mac_speed = data->fix_retime_src;

	plat_dat->init = sti_dwmac_init;

	plat_dat->exit = sti_dwmac_exit;



	ret = clk_prepare_enable(dwmac->clk);

	if (ret)

		return ret;



	ret = sti_dwmac_set_mode(dwmac);

	if (ret)

		goto disable_clk;



	ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res);

	if (ret)

		goto disable_clk;



	return 0;



disable_clk:

	clk_disable_unprepare(dwmac->clk);



	return ret;

}



static void sti_dwmac_remove(struct platform_device *pdev)

{

	struct sti_dwmac *dwmac = get_stmmac_bsp_priv(&pdev->dev);



	stmmac_dvr_remove(&pdev->dev);



	clk_disable_unprepare(dwmac->clk);

	return devm_stmmac_pltfr_probe(pdev, plat_dat, &stmmac_res);

}



static int sti_dwmac_suspend(struct device *dev)
@@ -334,7 +333,6 @@ MODULE_DEVICE_TABLE(of, sti_dwmac_match); 


static struct platform_driver sti_dwmac_driver = {

	.probe  = sti_dwmac_probe,

	.remove = sti_dwmac_remove,

	.driver = {

		.name           = "sti-dwmac",

		.pm		= pm_sleep_ptr(&sti_dwmac_pm_ops),