projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/users/willy/linux-nvme
[firefly-linux-kernel-4.4.55.git]
/
net
/
rfkill
/
core.c
diff --git
a/net/rfkill/core.c
b/net/rfkill/core.c
index ed7e0b4e7f90730b7530bbcf20106deaeb3d48bd..b3b16c070a7fae95c6bc5a5bdd087ce436476c5a 100644
(file)
--- a/
net/rfkill/core.c
+++ b/
net/rfkill/core.c
@@
-789,7
+789,8
@@
void rfkill_resume_polling(struct rfkill *rfkill)
if (!rfkill->ops->poll)
return;
if (!rfkill->ops->poll)
return;
- schedule_work(&rfkill->poll_work.work);
+ queue_delayed_work(system_power_efficient_wq,
+ &rfkill->poll_work, 0);
}
EXPORT_SYMBOL(rfkill_resume_polling);
}
EXPORT_SYMBOL(rfkill_resume_polling);
@@
-894,7
+895,8
@@
static void rfkill_poll(struct work_struct *work)
*/
rfkill->ops->poll(rfkill, rfkill->data);
*/
rfkill->ops->poll(rfkill, rfkill->data);
- schedule_delayed_work(&rfkill->poll_work,
+ queue_delayed_work(system_power_efficient_wq,
+ &rfkill->poll_work,
round_jiffies_relative(POLL_INTERVAL));
}
round_jiffies_relative(POLL_INTERVAL));
}
@@
-958,7
+960,8
@@
int __must_check rfkill_register(struct rfkill *rfkill)
INIT_WORK(&rfkill->sync_work, rfkill_sync_work);
if (rfkill->ops->poll)
INIT_WORK(&rfkill->sync_work, rfkill_sync_work);
if (rfkill->ops->poll)
- schedule_delayed_work(&rfkill->poll_work,
+ queue_delayed_work(system_power_efficient_wq,
+ &rfkill->poll_work,
round_jiffies_relative(POLL_INTERVAL));
if (!rfkill->persistent || rfkill_epo_lock_active) {
round_jiffies_relative(POLL_INTERVAL));
if (!rfkill->persistent || rfkill_epo_lock_active) {