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 cecbc5563a02 ("stmmac: allow to split suspend/resume
from init/exit callbacks").

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index 0a0d6a86f3979d260e2cda42282503e0d50e59ec..4d544c34c1f24ee4a7cce54878e167d19762c550 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -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);

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 705840e0438fec53136885d8b1b04f36367a7e04..3537fb33cc90c6ae0e9628f4ca8c08c692b4bdda 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -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;