mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
jme: Fix device PM wakeup API usage
According to Documentation/power/devices.txt The driver should not use device_set_wakeup_enable() which is the policy for user to decide. Using device_init_wakeup() to initialize dev->power.should_wakeup and dev->power.can_wakeup on driver initialization. And use device_may_wakeup() on suspend to decide if WoL function should be enabled on NIC. Reported-by: Diego Viola <diego.viola@gmail.com> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0772a99b81
commit
81422e672f
1 changed files with 2 additions and 4 deletions
|
@ -1931,7 +1931,7 @@ jme_wait_link(struct jme_adapter *jme)
|
|||
static void
|
||||
jme_powersave_phy(struct jme_adapter *jme)
|
||||
{
|
||||
if (jme->reg_pmcs) {
|
||||
if (jme->reg_pmcs && device_may_wakeup(&jme->pdev->dev)) {
|
||||
jme_set_100m_half(jme);
|
||||
if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
|
||||
jme_wait_link(jme);
|
||||
|
@ -2652,8 +2652,6 @@ jme_set_wol(struct net_device *netdev,
|
|||
if (wol->wolopts & WAKE_MAGIC)
|
||||
jme->reg_pmcs |= PMCS_MFEN;
|
||||
|
||||
device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -3178,7 +3176,7 @@ jme_init_one(struct pci_dev *pdev,
|
|||
jme->mii_if.mdio_write = jme_mdio_write;
|
||||
|
||||
jme_clear_pm_disable_wol(jme);
|
||||
device_set_wakeup_enable(&pdev->dev, true);
|
||||
device_init_wakeup(&pdev->dev, true);
|
||||
|
||||
jme_set_phyfifo_5level(jme);
|
||||
jme->pcirev = pdev->revision;
|
||||
|
|
Loading…
Reference in a new issue