Changeset 135 for GPL/trunk/alsa-kernel/isa

Timestamp:

Jun 13, 2007, 9:06:25 AM (18 years ago)

Author:

stevenhl

Message:

Get rid of spurious warnings

File:

• GPL/trunk/alsa-kernel/isa/opl3sa2.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/isa/opl3sa2.c

@@ -161 +161 @@
 static unsigned char snd_opl3sa_read(unsigned long port, unsigned char reg)
 {
-        unsigned long flags;
+        u32 flags;
         unsigned char result;
 
-        save_flags(flags);
+        save_flags(&flags);     // 12 Jun 07 SHL
         cli();
 #if 0
@@ -182 +182 @@
                              unsigned char reg, unsigned char value)
 {
-        unsigned long flags;
-
-        save_flags(flags);
+        u32 flags;
+
+        save_flags(&flags);
         cli();
 #if 0
@@ -261 +261 @@
 }
 
-static void snd_opl3sa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static int snd_opl3sa_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
         unsigned short status;
@@ -267 +267 @@
 
         if (oplcard == NULL || oplcard->card == NULL)
-                return;
+                return 0;
 
         spin_lock(&oplcard->reg_lock);
@@ -290 +290 @@
                 snd_ctl_notify(oplcard->card, SNDRV_CTL_EVENT_MASK_VALUE, &oplcard->master_volume->id);
         }
+        return 0;
 }
 
@@ -297 +298 @@
   0, 0, snd_opl3sa_info_single, \
   snd_opl3sa_get_single, snd_opl3sa_put_single, \
+  0, \
   reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
@@ -364 +366 @@
   0, 0, snd_opl3sa_info_double, \
   snd_opl3sa_get_double, snd_opl3sa_put_double, \
+  0, \
   left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }