Patch "jme: Fix device PM wakeup API usage" has been added to the 4.4-stable tree

This is a note to let you know that I've just added the patch titled

jme: Fix device PM wakeup API usage

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
jme-fix-device-pm-wakeup-api-usage.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Guo-Fu Tseng <[email protected]>
Date: Sat, 5 Mar 2016 08:11:56 +0800
Subject: jme: Fix device PM wakeup API usage

From: Guo-Fu Tseng <[email protected]>

commit 81422e672f8181d7ad1ee6c60c723aac649f538f 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.

---
 drivers/net/ethernet/jme.c |    6 ++----
 1 file changed, 2 insertions(+), 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;

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/jme-do-not-enable-nic-wol-functions-on-s0.patch queue-4.4/jme-fix-device-pm-wakeup-api-usage.patch