Changeset 598 for GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emu10k1x.c (modified) (4 diffs)

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

@@ -115 +115 @@
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
-#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA addresss */
+#define PLAYBACK_DMA_ADDR       0x04            /* Playback DMA address */
 #define PLAYBACK_PERIOD_SIZE    0x05            /* Playback period size */
 #define PLAYBACK_POINTER        0x06            /* Playback period pointer. Sample currently in DAC */
@@ -185 +185 @@
  *  - channel 0 is the front channel
  *  - channel 1 is the rear channel
- *  - channel 2 is the center/lfe chanel
+ *  - channel 2 is the center/lfe channel
  * Volume is controlled by the AC97 for the front and rear channels by
  * the PCM Playback Volume, Sigmatel Surround Playback Volume and
@@ -1045 +1045 @@
                         continue;
 
-                if ((reg < 0x49) /* && (reg >= 0) && (val <= 0xffffffff) && (channel_id >= 0) DAZ */ && (channel_id <= 2) )
+                if (reg < 0x49 && /* val <= 0xffffffff && DAZ */ channel_id <= 2)
                         snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
         }
@@ -1610 +1610 @@
 
 // PCI IDs
-static struct pci_device_id snd_emu10k1x_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1x_ids) = {
         { PCI_VDEVICE(CREATIVE, 0x0006), 0 },   /* Dell OEM version (EMU10K1) */
         { 0, }