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

Commit 5a3c7805 authored by Joachim Eastwood's avatar Joachim Eastwood Committed by David S. Miller
Browse files

Revert "net: stmmac: allow to split suspend/resume from init/exit callbacks" 



Instead of adding hooks inside stmmac_platform it is better to just use
the standard PM callbacks within the specific dwmac-driver. This only
used by the dwmac-rk driver.

This reverts commit cecbc556 ("stmmac: allow to split suspend/resume
from init/exit callbacks").

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

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+2 −6
Original line number Diff line number Diff line
@@ -417,9 +417,7 @@ static int stmmac_pltfr_suspend(struct device *dev) 
	struct platform_device *pdev = to_platform_device(dev);



	ret = stmmac_suspend(dev);

	if (priv->plat->suspend)

		priv->plat->suspend(pdev, priv->plat->bsp_priv);

	else if (priv->plat->exit)

	if (priv->plat->exit)

		priv->plat->exit(pdev, priv->plat->bsp_priv);



	return ret;
@@ -438,9 +436,7 @@ static int stmmac_pltfr_resume(struct device *dev) 
	struct stmmac_priv *priv = netdev_priv(ndev);

	struct platform_device *pdev = to_platform_device(dev);



	if (priv->plat->resume)

		priv->plat->resume(pdev, priv->plat->bsp_priv);

	else if (priv->plat->init)

	if (priv->plat->init)

		priv->plat->init(pdev, priv->plat->bsp_priv);



	return stmmac_resume(dev);

include/linux/stmmac.h

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ struct plat_stmmacenet_data { 
	void (*bus_setup)(void __iomem *ioaddr);

	int (*init)(struct platform_device *pdev, void *priv);

	void (*exit)(struct platform_device *pdev, void *priv);

	void (*suspend)(struct platform_device *pdev, void *priv);

	void (*resume)(struct platform_device *pdev, void *priv);

	void *bsp_priv;

	struct stmmac_axi *axi;

	int has_gmac4;