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

Timestamp:

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

Author:

stevenhl

Message:

Get rid of spurious warnings

Location:

GPL/trunk/alsa-kernel/pci

Files:

• ali5451/ali5451.c (modified) (3 diffs)
• cmipci.c (modified) (8 diffs)
• cs4281.c (modified) (3 diffs)
• es1968.c (modified) (1 diff)
• fm801.c (modified) (3 diffs)
• intel8x0.c (modified) (2 diffs)
• maestro3.c (modified) (1 diff)
• trident/trident.c (modified) (1 diff)
• trident/trident_main.c (modified) (5 diffs)
• via82xx.c (modified) (3 diffs)

GPL/trunk/alsa-kernel/pci/ali5451/ali5451.c

@@ -1800 +1800 @@
     { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, xindex,\
     0, 0, snd_ali5451_spdif_info, snd_ali5451_spdif_get, \
-    snd_ali5451_spdif_put, value}
+    snd_ali5451_spdif_put, 0, value}
 #else
 #define ALI5451_SPDIF(xname, xindex, value) \
@@ -1925 +1925 @@
     int err;
     static ac97_bus_ops_t ops = {
-        0,snd_ali_codec_write,
+        0,0,
+        snd_ali_codec_write,
         snd_ali_codec_read,0,0
     };
@@ -2033 +2034 @@
     if (codec->hw_initialized)
         snd_ali_disable_address_interrupt(codec);
-    if (codec->irq >= 0) {
+    // if (codec->irq >= 0) {   // 12 Jun 07 SHL avoid warning
         synchronize_irq(codec->irq);
         free_irq(codec->irq, (void *)codec);
-    }
+    // }        // 12 Jun 07 SHL
     if (codec->port)
         pci_release_regions(codec->pci);

GPL/trunk/alsa-kernel/pci/cmipci.c

@@ -1842 +1842 @@
     0, 0, snd_cmipci_info_volume, \
     snd_cmipci_get_volume, snd_cmipci_put_volume, \
+    0,\
     COMPOSE_SB_REG(left_reg, right_reg, left_shift, right_shift, mask, invert, stereo), \
     }
@@ -1943 +1944 @@
     0, 0, snd_cmipci_info_input_sw, \
     snd_cmipci_get_input_sw, snd_cmipci_put_input_sw, \
+    0, \
     COMPOSE_SB_REG(SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, left_shift, right_shift, 1, 0, 1), \
     }
@@ -2007 +2009 @@
     0, 0, snd_cmipci_info_native_mixer, \
     snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
+    0, \
     COMPOSE_SB_REG(reg, reg, lshift, rshift, 1, invert, 1), \
     }
@@ -2014 +2017 @@
     0, 0, snd_cmipci_info_native_mixer, \
     snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
+    0, \
     COMPOSE_SB_REG(reg, reg, shift, shift, 1, invert, 0), \
     }
@@ -2021 +2025 @@
     0, 0, snd_cmipci_info_native_mixer, \
     snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
+    0, \
     COMPOSE_SB_REG(reg, reg, lshift, rshift, mask, 0, 1), \
     }
@@ -2028 +2033 @@
     0, 0, snd_cmipci_info_native_mixer, \
     snd_cmipci_get_native_mixer, snd_cmipci_put_native_mixer, \
+    0, \
     COMPOSE_SB_REG(reg, reg, shift, shift, mask, 0, 0), \
     }
@@ -2128 +2134 @@
         snd_cmipci_get_native_mixer_sensitive,
         snd_cmipci_put_native_mixer_sensitive,
+        0,
         COMPOSE_SB_REG(CM_REG_MIXER1, CM_REG_MIXER1, CM_WSMUTE_SHIFT, CM_WSMUTE_SHIFT, 1, 1, 0),
     },
@@ -2303 +2310 @@
     snd_cmipci_uswitch_get, \
     snd_cmipci_uswitch_put, \
+    0, \
     (unsigned long)&cmipci_switch_arg_##sarg,\
     }

GPL/trunk/alsa-kernel/pci/cs4281.c

@@ -1102 +1102 @@
 static snd_kcontrol_new_t snd_cs4281_fm_vol =
 {
-    /*  .iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    /*  .name = */"Synth Playback Volume",0,0,0,
-    /*  .info = */snd_cs4281_info_volume,
-    /*  .get = */snd_cs4281_get_volume,
-    /*  .put = */snd_cs4281_put_volume,
-    /*  .private_value = */((BA0_FMLVC << 16) | BA0_FMRVC),
+    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name = "Synth Playback Volume",
+    .info = snd_cs4281_info_volume,
+    .get = snd_cs4281_get_volume,
+    .put = snd_cs4281_put_volume,
+    .private_value = ((BA0_FMLVC << 16) | BA0_FMRVC)
 };
 
 static snd_kcontrol_new_t snd_cs4281_pcm_vol =
 {
-    /*  .iface = */SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    /*  .name = */"PCM Stream Playback Volume",0,0,0,
-    /*  .info = */snd_cs4281_info_volume,
-    /*  .get = */snd_cs4281_get_volume,
-    /*  .put = */snd_cs4281_put_volume,
-    /*  .private_value = */ ((BA0_PPLVC << 16) | BA0_PPRVC),
+    .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name = "PCM Stream Playback Volume",
+    .info = snd_cs4281_info_volume,
+    .get = snd_cs4281_get_volume,
+    .put = snd_cs4281_put_volume,
+    .private_value = ((BA0_PPLVC << 16) | BA0_PPRVC)
 };
 
@@ -1142 +1142 @@
     int err;
     static ac97_bus_ops_t ops = {
-        0,
+        0,0,
         snd_cs4281_ac97_write,
         snd_cs4281_ac97_read,
@@ -1935 +1935 @@
 
     if (cmd & OPL3_RIGHT)
-        port = (unsigned long)chip->ba0 + BA0_B1AP; /* right port */
+        port = (void *)chip->ba0 + BA0_B1AP; /* right port */
     else
-        port = (unsigned long)chip->ba0 + BA0_B0AP; /* left port */
+        port = (void *)chip->ba0 + BA0_B0AP; /* left port */
 
     spin_lock_irqsave(&opl3->reg_lock, flags);

GPL/trunk/alsa-kernel/pci/es1968.c

@@ -2041 +2041 @@
     int err;
     static ac97_bus_ops_t ops = {
-        0, snd_es1968_ac97_write,
+        0, 0, snd_es1968_ac97_write,
         snd_es1968_ac97_read,0,0
     };

GPL/trunk/alsa-kernel/pci/fm801.c

@@ -1002 +1002 @@
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_single, \
   snd_fm801_get_single, snd_fm801_put_single, \
-  reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  0, reg | (shift << 8) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1047 +1047 @@
 { SNDRV_CTL_ELEM_IFACE_MIXER, 0,0, xname, 0,0,0, snd_fm801_info_double, \
   snd_fm801_get_double, snd_fm801_put_double, \
-  reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
+  0, reg | (shift_left << 8) | (shift_right << 12) | (mask << 16) | (invert << 24) }
 
 static int snd_fm801_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
@@ -1189 +1189 @@
         int err;
         static ac97_bus_ops_t ops = {
-            0, snd_fm801_codec_write,
+            0, 0, snd_fm801_codec_write,
             snd_fm801_codec_read, 0,0
         };

GPL/trunk/alsa-kernel/pci/intel8x0.c

@@ -3238 +3238 @@
 }
 
+#if 0 // fixme to be gone?
 static void __devexit snd_intel8x0_joystick_remove(struct pci_dev *pci)
 {
@@ -3253 +3254 @@
     pci_write_config_word(pci, 0xe6, val);
 }
+#endif // fixme to be gone
 
 static struct pci_device_id snd_intel8x0_joystick_ids[] = {

GPL/trunk/alsa-kernel/pci/maestro3.c

@@ -2126 +2126 @@
     int err;
     static ac97_bus_ops_t ops = {
-        0,snd_m3_ac97_write,
-        snd_m3_ac97_read,0,0
+        .write = snd_m3_ac97_write,
+        .read = snd_m3_ac97_read
     };
 

GPL/trunk/alsa-kernel/pci/trident/trident.c

@@ -78 +78 @@
 MODULE_DEVICE_TABLE(pci, snd_trident_ids);
 
+// 12 Jun 07 SHL fixme to be in some .h
+void __devinit snd_trident_gameport(struct snd_trident *chip);
+
 static int __devinit snd_trident_probe(struct pci_dev *pci,
                                        const struct pci_device_id *pci_id)

GPL/trunk/alsa-kernel/pci/trident/trident_main.c

@@ -145 +145 @@
 
 /*---------------------------------------------------------------------------
- void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata)
+ void snd_trident_codec_write(ac97_t *ac97, unsigned short reg, unsigned short wdata unsigned short unused)
 
  Description: This routine will do all of the writing to the external
@@ -2355 +2355 @@
     snd_trident_spdif_control_get,
     snd_trident_spdif_control_put,
+    0,
     0x28,
 };
@@ -2567 +2568 @@
     snd_trident_ac97_control_get,
     snd_trident_ac97_control_put,
+    0,
     4,
 };
@@ -2623 +2625 @@
     snd_trident_vol_control_get,
     snd_trident_vol_control_put,
-    16,
+    0,                  // tlv
+    16                  // private
 };
 
@@ -2940 +2943 @@
     int idx, err, retries = 2;
     static ac97_bus_ops_t ops = {
-        0,snd_trident_codec_write,
-        snd_trident_codec_read,0,0
+        0,              // reset
+        0,              // warm_reset
+        snd_trident_codec_write,
+        snd_trident_codec_read,
+        0,              // wait
+        0               // init
     };
     uctl = kcalloc(1, sizeof(*uctl), GFP_KERNEL);

GPL/trunk/alsa-kernel/pci/via82xx.c

@@ -618 +618 @@
  *  Used for 686 and 8233A
  */
-static irqreturn_t snd_via686_interrupt(int irq, void *dev_id)
+static irqreturn_t snd_via686_interrupt(int irq, void *dev_id, struct pt_regs *unused)
 {
         struct via82xx *chip = dev_id;
@@ -664 +664 @@
  *  Interrupt handler
  */
-static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id)
+static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id,struct pt_regs *unused)
 {
         struct via82xx *chip = dev_id;
@@ -2311 +2311 @@
         if (request_irq(pci->irq,
                         chip_type == TYPE_VIA8233 ?
-                        snd_via8233_interrupt : snd_via686_interrupt,
+                          snd_via8233_interrupt : snd_via686_interrupt,
                         SA_INTERRUPT|SA_SHIRQ,
                         card->driver, chip)) {