Changeset 661 for GPL

Timestamp:

Jan 26, 2021, 4:54:11 AM (5 years ago)

Author:

Paul Smedley

Message:

More code cleanups

Location:

GPL/branches/uniaud32-next

Files:

• alsa-kernel/core/pcm_lib.c (modified) (2 diffs)
• lib32/seq_file.c (modified) (5 diffs)

GPL/branches/uniaud32-next/alsa-kernel/core/pcm_lib.c

@@ -1404 +1404 @@
 EXPORT_SYMBOL(snd_pcm_hw_constraint_ratdens);
 
+#ifdef TARGET_OS2
+static inline min_not_zero(unsigned int x, unsigned int y) {
+        unsigned int __x = (x);
+        unsigned int __y = (y);
+        __x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y));
+}
+#endif
+
 static int snd_pcm_hw_rule_msbits(struct snd_pcm_hw_params *params,
                                   struct snd_pcm_hw_rule *rule)
@@ -1418 +1426 @@
         if ((snd_interval_value(i) == width) ||
             (width == 0 && snd_interval_value(i) > msbits))
-#ifdef TARGET_OS2 //fixme min_not_zero uses typeof()
-                params->msbits = msbits;
-#else
                 params->msbits = min_not_zero(params->msbits, msbits);
-#endif
 
         return 0;

GPL/branches/uniaud32-next/lib32/seq_file.c

@@ -128 +128 @@
                 if (error < 0)
                         break;
-#if 0 //fixme
-                if (unlikely(error)) {
+                if (error) {
                         error = 0;
                         m->count = 0;
                 }
-#endif
                 if (seq_has_overflowed(m))
                         goto Eoverflow;
@@ -196 +194 @@
         m->version = file->f_version;
 
-#if 0 //fixme
         /* Don't assume *ppos is where we left it */
-        if (unlikely(*ppos != m->read_pos)) {
+        if (*ppos != m->read_pos) {
                 while ((err = traverse(m, *ppos)) == -EAGAIN)
                         ;
@@ -212 +209 @@
                 }
         }
-#endif
+
         /* grab buffer if we didn't have one */
         if (!m->buf) {
@@ -247 +244 @@
                 if (err < 0)
                         break;
-#if 0 //fixme
-                if (unlikely(err))
+                if (err)
                         m->count = 0;
-                if (unlikely(!m->count)) {
+                if (!m->count) {
                         p = m->op->next(m, p, &pos);
                         m->index = pos;
                         continue;
                 }
-#endif
                 if (m->count < m->size)
                         goto Fill;
@@ -284 +279 @@
                 if (seq_has_overflowed(m) || err) {
                         m->count = offs;
-#if 0 //fixme
-                        if (likely(err <= 0))
+                        if (err <= 0)
                                 break;
-#endif
                 }
                 pos = next;