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

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
...@@ -417,9 +417,7 @@ static int stmmac_pltfr_suspend(struct device *dev) ...@@ -417,9 +417,7 @@ static int stmmac_pltfr_suspend(struct device *dev)
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
ret = stmmac_suspend(dev); ret = stmmac_suspend(dev);
if (priv->plat->suspend) if (priv->plat->exit)
priv->plat->suspend(pdev, priv->plat->bsp_priv);
else if (priv->plat->exit)
priv->plat->exit(pdev, priv->plat->bsp_priv); priv->plat->exit(pdev, priv->plat->bsp_priv);
return ret; return ret;
...@@ -438,9 +436,7 @@ static int stmmac_pltfr_resume(struct device *dev) ...@@ -438,9 +436,7 @@ static int stmmac_pltfr_resume(struct device *dev)
struct stmmac_priv *priv = netdev_priv(ndev); struct stmmac_priv *priv = netdev_priv(ndev);
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
if (priv->plat->resume) if (priv->plat->init)
priv->plat->resume(pdev, priv->plat->bsp_priv);
else if (priv->plat->init)
priv->plat->init(pdev, priv->plat->bsp_priv); priv->plat->init(pdev, priv->plat->bsp_priv);
return stmmac_resume(dev); return stmmac_resume(dev);
......
...@@ -135,8 +135,6 @@ struct plat_stmmacenet_data { ...@@ -135,8 +135,6 @@ struct plat_stmmacenet_data {
void (*bus_setup)(void __iomem *ioaddr); void (*bus_setup)(void __iomem *ioaddr);
int (*init)(struct platform_device *pdev, void *priv); int (*init)(struct platform_device *pdev, void *priv);
void (*exit)(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; void *bsp_priv;
struct stmmac_axi *axi; struct stmmac_axi *axi;
int has_gmac4; int has_gmac4;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment