Changeset 118

Timestamp:

Jun 4, 2007, 3:50:19 AM (18 years ago)

Author:

Brendan Oakley

Message:

Muted some compile warnings, moved atomic_dec_and_test from compat_22.h to atomic.h

Location:

GPL/trunk

Files:

• alsa-kernel/core/control.c (modified) (2 diffs)
• alsa-kernel/core/hwdep.c (modified) (1 diff)
• alsa-kernel/core/info.c (modified) (2 diffs)
• alsa-kernel/include/sound/compat_22.h (modified) (1 diff)
• include/asm/atomic.h (modified) (1 diff)

GPL/trunk/alsa-kernel/core/control.c

@@ -957 +957 @@
 }
 
+#if 0 /* Uniaud: Not used until Alsa version 1.0.9 */
 static int snd_ctl_elem_add_user(struct snd_ctl_file *file,
                                  struct snd_ctl_elem_info __user *_info, int replace)
@@ -965 +966 @@
         return snd_ctl_elem_add(file, &info, replace);
 }
+#endif /* Uniaud */
 
 static int snd_ctl_elem_remove(struct snd_ctl_file *file, struct snd_ctl_elem_id *_id)

GPL/trunk/alsa-kernel/core/hwdep.c

@@ -128 +128 @@
         schedule();
         down(&hw->open_mutex);
+#ifndef TARGET_OS2
+/* MKG quiet OW:
+   see include/linux/signal.h
+   #define signal_pending(p) 0
+   Never returns true */
         if (signal_pending(current)) {
             err = -ERESTARTSYS;
             break;
         }
+#endif /* TARGET_OS2 */
     }
     remove_wait_queue(&hw->open_wait, &wait);

GPL/trunk/alsa-kernel/core/info.c

@@ -190 +190 @@
     snd_assert(data != NULL, return -ENXIO);
     pos = *offset;
+#ifndef TARGET_OS2
+/* MKG: pos is loff_t (see include/linux/types.h) which is
+   typedef unsigned long - check later */
     if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
         return -EIO;
+#endif /* TARGET_OS2 */
     if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
         return -EIO;
@@ -232 +236 @@
     entry = data->entry;
     pos = *offset;
+#ifndef TARGET_OS2
+/* MKG: pos is loff_t (see include/linux/types.h) which is
+   typedef unsigned long - check later */
     if (pos < 0 || (long) pos != pos || (ssize_t) count < 0)
         return -EIO;
+#endif /* TARGET_OS2 */
     if ((unsigned long) pos + (unsigned long) count < (unsigned long) pos)
         return -EIO;

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

@@ -406 +406 @@
 #endif
 
-#define ATOMIC_INIT(i)  { (i) }
-
-/**
- * atomic_dec_and_test - decrement and test
- * @v: pointer of type atomic_t
- *
- * Atomically decrements @v by 1 and
- * returns true if the result is 0, or false for all other
- * cases.  Note that the guaranteed
- * useful range of an atomic_t is only 24 bits.
- */
-static inline int atomic_dec_and_test(volatile atomic_t *v)
-{
-    atomic_dec(v);
-    if (v->counter == 0)
-        return 1;
-    return 0;
-}
-
 /**
  * list_for_each_safe   -       iterate over a list safe against removal of list entry

GPL/trunk/include/asm/atomic.h

@@ -24 +24 @@
   parm [eax];
 
-int atomic_dec_and_test(volatile atomic_t *v);
+/**
+ * atomic_dec_and_test - decrement and test
+ * @v: pointer of type atomic_t
+ *
+ * Atomically decrements @v by 1 and
+ * returns true if the result is 0, or false for all other
+ * cases.  Note that the guaranteed
+ * useful range of an atomic_t is only 24 bits.
+ */
+static inline int atomic_dec_and_test(volatile atomic_t *v)
+{
+    atomic_dec(v);
+    if (v->counter == 0)
+        return 1;
+    return 0;
+}
+
 extern int atomic_add_negative(int i, volatile atomic_t *v);