Changeset 660

Timestamp:

Jan 25, 2021, 11:33:33 PM (5 years ago)

Author:

Paul Smedley

Message:

More code cleanups

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/oss/pcm_oss.c (modified) (4 diffs)
• include/linux/bitops.h (modified) (1 diff)
• include/linux/kernel.h (modified) (1 diff)
• include/linux/log2.h (modified) (2 diffs)

GPL/branches/uniaud32-next/alsa-kernel/core/oss/pcm_oss.c

@@ -30 +30 @@
 #include <sound/initval.h>
 #include <sound/mixer_oss.h>
-#ifdef TARGET_OS2
-static inline unsigned int ld2(u_int32_t v)
-{
-        unsigned r = 0;
-
-        if (v >= 0x10000) {
-                v >>= 16;
-                r += 16;
-        }
-        if (v >= 0x100) {
-                v >>= 8;
-                r += 8;
-        }
-        if (v >= 0x10) {
-                v >>= 4;
-                r += 4;
-        }
-        if (v >= 4) {
-                v >>= 2;
-                r += 2;
-        }
-        if (v >= 2)
-                r++;
-        return r;
-}
-#endif
 
 #define OSS_ALSAEMULVER         _SIOR ('M', 249, int)
@@ -730 +704 @@
         if (!oss_buffer_size)
                 return -EINVAL;
-#ifndef TARGET_OS2 //fixme
         oss_buffer_size = rounddown_pow_of_two(oss_buffer_size);
-#else
-        oss_buffer_size = 1 << ld2(oss_buffer_size);
-#endif
         if (atomic_read(&substream->mmap_count)) {
                 if (oss_buffer_size > runtime->oss.mmap_bytes)
@@ -771 +741 @@
         if (min_period_size) {
                 min_period_size *= oss_frame_size;
-#ifndef TARGET_OS2 //fixme
                 min_period_size = roundup_pow_of_two(min_period_size);
-#else
-                min_period_size = 1 << (ld2(min_period_size - 1) + 1);
-#endif
                 if (oss_period_size < min_period_size)
                         oss_period_size = min_period_size;
@@ -784 +750 @@
         if (max_period_size) {
                 max_period_size *= oss_frame_size;
-#ifndef TARGET_OS2 //fixme
                 max_period_size = rounddown_pow_of_two(max_period_size);
-#else
-                max_period_size = 1 << ld2(max_period_size);
-#endif
 
                 if (oss_period_size > max_period_size)

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

@@ -193 +193 @@
 }
 
+static inline unsigned fls_long(unsigned long l)
+{
+                return fls(l);
+}
+
 #endif /* _I386_BITOPS_H */

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

@@ -11 +11 @@
 #include <stdarg.h>
 //#include <linux/linkage.h>
+#include <linux/bitops.h>
 #include <linux/gfp.h>
 #include <linux/types.h>
-#include <linux/bitops.h>
+#include <linux/log2.h>
 
 /* Optimization barrier */

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

@@ -14 +14 @@
 {
         return (n != 0 && ((n & (n - 1)) == 0));
+}
+
+/**
+ * __roundup_pow_of_two() - round up to nearest power of two
+ * @n: value to round up
+ */
+static inline /*__attribute__((const))*/
+unsigned long __roundup_pow_of_two(unsigned long n)
+{
+        return 1UL << fls_long(n - 1);
+}
+
+/**
+ * __rounddown_pow_of_two() - round down to nearest power of two
+ * @n: value to round down
+ */
+static inline /*__attribute__((const))*/
+unsigned long __rounddown_pow_of_two(unsigned long n)
+{
+        return 1UL << (fls_long(n) - 1);
 }
 
@@ -62 +82 @@
 }
 
+/**
+ * roundup_pow_of_two - round the given value up to nearest power of two
+ * @n: parameter
+ *
+ * round the given value up to the nearest power of two
+ * - the result is undefined when n == 0
+ * - this can be used to initialise global variables from constant data
+ */
+#define roundup_pow_of_two(n)                   \
+(                                               \
+        __roundup_pow_of_two(n)                 \
+ )
+
+/**
+ * rounddown_pow_of_two - round the given value down to nearest power of two
+ * @n: parameter
+ *
+ * round the given value down to the nearest power of two
+ * - the result is undefined when n == 0
+ * - this can be used to initialise global variables from constant data
+ */
+#define rounddown_pow_of_two(n)                 \
+(                                               \
+        __rounddown_pow_of_two(n)               \
+ )
+
 #endif /* _LINUX_LOG2_H */