Changeset 646

Timestamp:

Jan 16, 2021, 10:44:28 PM (5 years ago)

Author:

Paul Smedley

Message:

Move remaining functions from compat_22.h into appropriate linux header and remove legacy header; remove unused adriver.h

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/include/sound/adriver.h (deleted)
• alsa-kernel/include/sound/compat_22.h (deleted)
• alsa-kernel/include/sound/config.h (modified) (1 diff)
• include/linux/completion.h (modified) (1 diff)
• include/linux/rwsem.h (modified) (1 diff)
• include/linux/types.h (modified) (1 diff)
• include/linux/workqueue.h (modified) (1 diff)

GPL/branches/uniaud32-next/alsa-kernel/include/sound/config.h

@@ -64 +64 @@
 #include <linux/lockdep.h>
 #include <linux/smp_lock.h>
-#include "compat_22.h"
 
 #include <sound/asound.h>

GPL/branches/uniaud32-next/include/linux/completion.h

@@ -3 +3 @@
 
 #include <linux/wait.h>
-#include <sound/compat_22.h>
+
 /*
  * struct completion - structure used to maintain state for a "completion"

GPL/branches/uniaud32-next/include/linux/rwsem.h

@@ -3 +3 @@
 #ifndef _LINUX_RWSEM_H
 #define _LINUX_RWSEM_H
+/* rw_semaphore - replaced with mutex */
+#define rw_semaphore semaphore
+#define init_rwsem(x) init_MUTEX(x)
+#define DECLARE_RWSEM(x) DECLARE_MUTEX(x)
+#define down_read(x) down(x)
+#define down_write(x) down(x)
+#define up_read(x) up(x)
+#define up_write(x) up(x)
+
 static inline int down_write_trylock(struct rw_semaphore *sem) {return 0;}
-#define init_rwsem(x) init_MUTEX(x)
 #endif /* _LINUX_RWSEM_H */

GPL/branches/uniaud32-next/include/linux/types.h

@@ -149 +149 @@
 typedef u32 phys_addr_t;
 typedef s64                     int64_t;
+
+#define DECLARE_BITMAP(name,bits) \
+        unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
+
 #endif /* _LINUX_TYPES_H */

GPL/branches/uniaud32-next/include/linux/workqueue.h

@@ -3 +3 @@
 
 #include <linux/timer.h>
-#include <sound/compat_22.h>
 #include <linux/completion.h>