Skip to content

Commit

Permalink
sh_eth: add more PM methods
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mikhail Ulyanov authored and David S. Miller committed Jan 26, 2015
1 parent e7d7e89 commit b71af04
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions drivers/net/ethernet/renesas/sh_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2947,6 +2947,36 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
}

#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)
{
/* Runtime PM callback shared between ->runtime_suspend()
Expand All @@ -2960,6 +2990,7 @@ static int sh_eth_runtime_nop(struct device *dev)
}

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)
};
#define SH_ETH_PM_OPS (&sh_eth_dev_pm_ops)
Expand Down

0 comments on commit b71af04

Please sign in to comment.