Changeset 479 for GPL/trunk/alsa-kernel/pci/emu10k1

Timestamp:

May 1, 2010, 9:49:10 PM (16 years ago)

Author:

David Azarewicz

Message:

Cleanup compiler warnings

Location:

GPL/trunk/alsa-kernel/pci/emu10k1

Files:

• emufx.c (modified) (9 diffs)
• io.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

@@ -40 +40 @@
 #include <sound/tlv.h>
 #include <sound/emu10k1.h>
+#include <proto.h>
 
 #if 0           /* for testing purposes - digital out -> capture */
@@ -53 +54 @@
 /*
  *  Tables
- */ 
+ */
 
 static char *fxbuses[16] = {
@@ -304 +305 @@
 /*
  */
- 
+
 static inline mm_segment_t snd_enter_user(void)
 {
@@ -1256 +1257 @@
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Capture Volume", gpr, 0);
         gpr += 2;
-      
+
         /*
          * inputs
@@ -1332 +1333 @@
                                         gpr, 0);
         gpr += 2;
-        
+
         /* Philips ADC Playback Volume */
         A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);
@@ -1530 +1531 @@
         }
 
-        /* IEC958 Optical Raw Playback Switch */ 
+        /* IEC958 Optical Raw Playback Switch */
         gpr_map[gpr++] = 0;
         gpr_map[gpr++] = 0x1008;
@@ -1570 +1571 @@
                         snd_printk(KERN_INFO "EMU2 inputs on\n");
                         for (z = 0; z < 0x10; z++) {
-                                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 
+                                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp,
                                                                         bit_shifter16,
                                                                         A3_EMU32IN(z),
@@ -2295 +2296 @@
                  * and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.
                  *
-                 * Since only 14 of the 16 EXTINs are used, this is not a big problem.  
-                 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 
-                 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 
-                 * channel.  Multitrack recorders will still see the center/lfe output signal 
+                 * Since only 14 of the 16 EXTINs are used, this is not a big problem.
+                 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture
+                 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture
+                 * channel.  Multitrack recorders will still see the center/lfe output signal
                  * on the second and third channels.
                  */
@@ -2311 +2312 @@
                         OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));
         }
-            
+        
 
         if (gpr > tmp) {

GPL/trunk/alsa-kernel/pci/emu10k1/io.c

@@ -102 +102 @@
 EXPORT_SYMBOL(snd_emu10k1_ptr_write);
 
-unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 
-                                          unsigned int reg, 
+unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu,
+                                          unsigned int reg,
                                           unsigned int chn)
 {
         unsigned long flags;
         unsigned int regptr, val;
-  
+
         regptr = (reg << 16) | chn;
 
@@ -118 +118 @@
 }
 
-void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, 
-                                   unsigned int reg, 
-                                   unsigned int chn, 
+void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu,
+                                   unsigned int reg,
+                                   unsigned int chn,
                                    unsigned int data)
 {
@@ -245 +245 @@
                 err = -EINVAL;
         }
-    
+
         spin_unlock(&emu->i2c_lock);
         return err;
@@ -257 +257 @@
                 return 1;
         reg += 0x40; /* 0x40 upwards are registers. */
-        if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */
+        if (value > 0x3f) /* 0 to 0x3f are values */
                 return 1;
         spin_lock_irqsave(&emu->emu_lock, flags);