Commit 96478751 authored by Guo-Fu Tseng's avatar Guo-Fu Tseng Committed by Ben Hutchings

jme: Fix device PM wakeup API usage

commit 81422e67 upstream.

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: default avatarDiego Viola <diego.viola@gmail.com>
Signed-off-by: default avatarGuo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent bf40aff7
...@@ -1935,7 +1935,7 @@ jme_wait_link(struct jme_adapter *jme) ...@@ -1935,7 +1935,7 @@ jme_wait_link(struct jme_adapter *jme)
static void static void
jme_powersave_phy(struct jme_adapter *jme) 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); jme_set_100m_half(jme);
if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN)) if (jme->reg_pmcs & (PMCS_LFEN | PMCS_LREN))
jme_wait_link(jme); jme_wait_link(jme);
...@@ -2656,8 +2656,6 @@ jme_set_wol(struct net_device *netdev, ...@@ -2656,8 +2656,6 @@ jme_set_wol(struct net_device *netdev,
if (wol->wolopts & WAKE_MAGIC) if (wol->wolopts & WAKE_MAGIC)
jme->reg_pmcs |= PMCS_MFEN; jme->reg_pmcs |= PMCS_MFEN;
device_set_wakeup_enable(&jme->pdev->dev, !!(jme->reg_pmcs));
return 0; return 0;
} }
...@@ -3182,7 +3180,7 @@ jme_init_one(struct pci_dev *pdev, ...@@ -3182,7 +3180,7 @@ jme_init_one(struct pci_dev *pdev,
jme->mii_if.mdio_write = jme_mdio_write; jme->mii_if.mdio_write = jme_mdio_write;
jme_clear_pm_disable_wol(jme); 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_set_phyfifo_5level(jme);
jme->pcirev = pdev->revision; jme->pcirev = pdev->revision;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment