Changeset 522 for GPL/trunk/alsa-kernel/include/sound/adriver.h

Timestamp:

Jul 22, 2010, 7:20:45 PM (15 years ago)

Author:

David Azarewicz

Message:

flush_workqueue hack, compiler warnings

File:

• GPL/trunk/alsa-kernel/include/sound/adriver.h (modified) (3 diffs)

GPL/trunk/alsa-kernel/include/sound/adriver.h

@@ +1 @@
+Apparently this file is not used on OS2
 #ifndef __SOUND_LOCAL_DRIVER_H
 #define __SOUND_LOCAL_DRIVER_H
@@ -678 +679 @@
 #define schedule_work(w) snd_compat_schedule_work(w)
 struct workqueue_struct *snd_compat_create_workqueue(const char *name);
-#ifndef TARGET_OS2
-#define create_workqueue(name) snd_compat_create_workqueue((name))
-#endif
+
 void snd_compat_flush_workqueue(struct workqueue_struct *wq);
 #define flush_workqueue(wq) snd_compat_flush_workqueue((wq));
 void snd_compat_destroy_workqueue(struct workqueue_struct *wq);
-#ifndef TARGET_OS2
-#define destroy_workqueue(wq) snd_compat_destroy_workqueue((wq));
-#endif
 int snd_compat_queue_work(struct workqueue_struct *wq, struct work_struct *work);
-#ifndef TARGET_OS2
-#define queue_work(wq, work) snd_compat_queue_work((wq), (work))
-#endif
 int snd_compat_queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *work, unsigned long delay);
-#ifndef TARGET_OS2
-#define queue_delayed_work(wq, work, delay) snd_compat_queue_delayed_work((wq), (work), (delay))
-#endif
 #define schedule_delayed_work(work, delay) snd_compat_queue_delayed_work(NULL, (work), (delay))
 int snd_compat_cancel_delayed_work(struct delayed_work *work);
 #define cancel_delayed_work(work) snd_compat_cancel_delayed_work(work)
 #define flush_scheduled_work()
+
+#ifndef TARGET_OS2
+#define create_workqueue(name) snd_compat_create_workqueue((name))
+#define destroy_workqueue(wq) snd_compat_destroy_workqueue((wq));
+#define queue_work(wq, work) snd_compat_queue_work((wq), (work))
+#define queue_delayed_work(wq, work, delay) snd_compat_queue_delayed_work((wq), (work), (delay))
+#endif
+
 #ifdef TARGET_OS2
 struct completion {
@@ -963 +961 @@
         MODULE_PARM(name, SNDRV_MODULE_TYPE_##type)
 #else
-#define module_param_array(name, type, nump, perm) 
-#define module_param(name, type, perm) 
+#define module_param_array(name, type, nump, perm)
+#define module_param(name, type, perm)
 #endif /* TARGET_OS2 */
 #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 10)