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

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/trident

Files:

• trident.c (modified) (1 diff)
• trident_main.c (modified) (5 diffs)

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);