stmmac: use custom init/exit functions in pm ops

Freeze and restore can call the custom init/exit functions.
Also the patch adds a custom data field that can be used
for storing platform data useful on restore the embedded
setup (e.g. GPIO, SYSCFG).

Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.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 12bd221561e575203bb9d2457f9e0e98e26961b9..ba30d38a6caf65df94d949a3e0d6329db376a9dd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -186,9 +186,6 @@ static int stmmac_pltfr_remove(struct platform_device *pdev)
        struct resource *res;
        int ret = stmmac_dvr_remove(ndev);
 
-       if (priv->plat->exit)
-               priv->plat->exit(pdev);
-
        if (priv->plat->exit)
                priv->plat->exit(pdev);
 
@@ -218,14 +215,26 @@ static int stmmac_pltfr_resume(struct device *dev)
 
 int stmmac_pltfr_freeze(struct device *dev)
 {
+       int ret;
+       struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
        struct net_device *ndev = dev_get_drvdata(dev);
+       struct platform_device *pdev = to_platform_device(dev);
 
-       return stmmac_freeze(ndev);
+       ret = stmmac_freeze(ndev);
+       if (plat_dat->exit)
+               plat_dat->exit(pdev);
+
+       return ret;
 }
 
 int stmmac_pltfr_restore(struct device *dev)
 {
+       struct plat_stmmacenet_data *plat_dat = dev_get_platdata(dev);
        struct net_device *ndev = dev_get_drvdata(dev);
+       struct platform_device *pdev = to_platform_device(dev);
+
+       if (plat_dat->init)
+               plat_dat->init(pdev);
 
        return stmmac_restore(ndev);
 }

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index cf64031863596d37440cfeba6995ec878895ef6d..f85c93d6e6dab25a8fdd8b5810932891bb3370b2 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -109,6 +109,7 @@ struct plat_stmmacenet_data {
        int (*init)(struct platform_device *pdev);
        void (*exit)(struct platform_device *pdev);
        void *custom_cfg;
+       void *custom_data;
        void *bsp_priv;
 };
 #endif