p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sh_eth: add more PM methods 

Add sh_eth_{suspend|resume}() implementing {suspend|resume|freeze|thaw|poweroff|
restore}() PM methods to make it possible to restore from hibernation not only
in Linux  but also in e.g. U-Boot and  to have more determined state on resume/
restore.

Signed-off-by: Mikhail Ulyanov <mikhail.ulyanov@cogentembedded.com>
[Sergei: moved sh_eth_{suspend|resume}() before sh_eth_runtime_nop(), enclosed
them with #ifdef CONFIG_PM_SLEEP, reordered the local variables, got rid of
*goto* and label, reordered macro invocations, renamed, modified the changelog.]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mikhail Ulyanov 2015-01-22 01:19:48 +03:00 committed by David S. Miller
parent e7d7e89846
commit b71af04676
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/net/ethernet/renesas/sh_eth.c
View File

@ -2947,6 +2947,36 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP
static int sh_eth_suspend(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
int ret = 0;
if (netif_running(ndev)) {
netif_device_detach(ndev);
ret = sh_eth_close(ndev);
}
return ret;
}
static int sh_eth_resume(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
int ret = 0;
if (netif_running(ndev)) {
ret = sh_eth_open(ndev);
if (ret < 0)
return ret;
netif_device_attach(ndev);
}
return ret;
}
#endif
static int sh_eth_runtime_nop(struct device *dev) static int sh_eth_runtime_nop(struct device *dev)
{ {
/* Runtime PM callback shared between ->runtime_suspend() /* Runtime PM callback shared between ->runtime_suspend()
@ -2960,6 +2990,7 @@ static int sh_eth_runtime_nop(struct device *dev)
} }
static const struct dev_pm_ops sh_eth_dev_pm_ops = { static const struct dev_pm_ops sh_eth_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(sh_eth_suspend, sh_eth_resume)
SET_RUNTIME_PM_OPS(sh_eth_runtime_nop, sh_eth_runtime_nop, NULL) SET_RUNTIME_PM_OPS(sh_eth_runtime_nop, sh_eth_runtime_nop, NULL)
}; };
#define SH_ETH_PM_OPS (&sh_eth_dev_pm_ops) #define SH_ETH_PM_OPS (&sh_eth_dev_pm_ops)