Changeset 598 for GPL/trunk/alsa-kernel/pci/nm256/nm256.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/nm256/nm256.c (modified) (13 diffs)

GPL/trunk/alsa-kernel/pci/nm256/nm256.c ¶

@@ -1 @@
-/* 
+/*
  * Driver for NeoMagic 256AV and 256ZX chipsets.
  * Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>
@@ -24 +24 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-  
+
 #include <asm/io.h>
 #include <linux/delay.h>
@@ -87 +87 @@
 
 /* just for backward compatibility */
-static int enable;
+//static int enable;
 module_param(enable, bool, 0444);
 
@@ -263 +263 @@
  * PCI ids
  */
-static struct pci_device_id snd_nm256_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_nm256_ids) = {
         {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0},
         {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0},
@@ -401 +401 @@
 };
 static struct snd_pcm_hw_constraint_list constraints_rates = {
-        .count = ARRAY_SIZE(samplerates), 
+        .count = ARRAY_SIZE(samplerates),
         .list = samplerates,
         .mask = 0,
@@ -957 +957 @@
 
 
-/* 
- * Initialize the hardware. 
+/*
+ * Initialize the hardware.
  */
 static void
@@ -998 +998 @@
 }
 
-/* 
- * Handle a potential interrupt for the device referred to by DEV_ID. 
+/*
+ * Handle a potential interrupt for the device referred to by DEV_ID.
  *
  * I don't like the cut-n-paste job here either between the two routines,
@@ -1148 +1148 @@
         testb = chip->mixer_status_mask;
 
-        /* 
-         * Loop around waiting for the mixer to become ready. 
+        /*
+         * Loop around waiting for the mixer to become ready.
          */
         while (timeout-- > 0) {
@@ -1159 +1159 @@
 }
 
-/* 
+/*
  * Initial register values to be written to the AC97 mixer.
  * While most of these are identical to the reset values, we do this
@@ -1188 +1188 @@
         { AC97_REC_GAIN,        0x0B0B },
         { AC97_GENERAL_PURPOSE, 0x0000 },
-        { AC97_3D_CONTROL,      0x8000 }, 
+        { AC97_3D_CONTROL,      0x8000 },
         { AC97_VENDOR_ID1,      0x8384 },
         { AC97_VENDOR_ID2,      0x7609 },
@@ -1218 +1218 @@
 }
 
-/* 
+/*
  */
 static void
@@ -1331 +1331 @@
 }
 
-/* 
+/*
  * See if the signature left by the NM256 BIOS is intact; if so, we use
  * the associated address as the end of our audio buffer in the video
@@ -1499 +1499 @@
         chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize = capture_bufsize * 1024;
 
-        /* 
+        /*
          * The NM256 has two memory ports.  The first port is nothing
          * more than a chunk of video RAM, which is used as the I/O ring