Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07a5e769 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

stmmac: dwmac-rk: absorb rk_gmac_init into probe 



Since the rk_gmac_init() only calls another function move this
function call into probe so rk_gmac_init() can be removed.

Since commit cecbc556 ("stmmac: allow to split suspend/resume
from init/exit callbacks") the init hook is no longer used in
dwmac-rk so this can be removed.

Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0de8c4c9

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

+1 −9
Original line number Diff line number Diff line
@@ -901,13 +901,6 @@ static void rk_gmac_powerdown(struct rk_priv_data *gmac) 
	gmac_clk_enable(gmac, false);

}



static int rk_gmac_init(struct platform_device *pdev, void *priv)

{

	struct rk_priv_data *bsp_priv = priv;



	return rk_gmac_powerup(bsp_priv);

}



static void rk_fix_speed(void *priv, unsigned int speed)

{

	struct rk_priv_data *bsp_priv = priv;
@@ -943,14 +936,13 @@ static int rk_gmac_probe(struct platform_device *pdev) 
		return PTR_ERR(plat_dat);



	plat_dat->has_gmac = true;

	plat_dat->init = rk_gmac_init;

	plat_dat->fix_mac_speed = rk_fix_speed;



	plat_dat->bsp_priv = rk_gmac_setup(pdev, data);

	if (IS_ERR(plat_dat->bsp_priv))

		return PTR_ERR(plat_dat->bsp_priv);



	ret = rk_gmac_init(pdev, plat_dat->bsp_priv);

	ret = rk_gmac_powerup(plat_dat->bsp_priv);

	if (ret)

		return ret;