Changeset 598 for GPL/trunk/include/linux/workqueue.h

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/workqueue.h (modified) (3 diffs)

GPL/trunk/include/linux/workqueue.h

@@ -3 +3 @@
 
 #include <linux/timer.h>
-#include <compat_22.h>
+#include <sound/compat_22.h>
 /* we know this is used below exactly once for at most one waiter */
 
@@ -33 +33 @@
 int queue_work(struct workqueue_struct *wq, struct work_struct *work);
 void flush_workqueue(struct workqueue_struct *wq);
+int queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork, unsigned long delay);
+int cancel_delayed_work(struct delayed_work *dwork);
 
 #define INIT_WORK(_work, _func, _data)                  \
@@ -54 +56 @@
 #undef INIT_WORK
 #define INIT_WORK(w,f) snd_INIT_WORK(w,f)
+#define INIT_DELAYED_WORK(_work, _func) INIT_WORK(&(_work)->work, _func)
+#define work_pending(work) test_bit(0, &(work)->pending)
+#define delayed_work_pending(w) work_pending(&(w)->work)
+#define schedule_delayed_work(work, delay) queue_delayed_work(NULL, (work), (delay))
+
 #define create_singlethread_workqueue(name) create_workqueue(name)
-
+#define cancel_delayed_work_sync flush_delayed_work_sync
 #endif /* __LINUX_WORKQUEUE_H */