At Fri, 21 May 2010 17:35:03 -0500, H Hartley Sweeten wrote:

Use the VENDOR/DEVICE ids provided in pci_ids.h instead of creating local ids of the same values.

Also, fix the following checkpatch.pl warnings:

WARNING: Use #include <linux/io.h> instead of <asm/io.h> WARNING: unnecessary whitespace before a quoted newline

Signed-off-by: H Hartley Sweeten hsweeten@visionengravers.com Cc: Jaroslav Kysela perex@perex.cz Cc: Takashi Iwai tiwai@suse.de

Applied now. Thanks.

Takashi

---

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 67921f9..c150022 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -26,7 +26,7 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/delay.h> -#include <asm/io.h> +#include <linux/io.h> #include <sound/core.h> #include <sound/initval.h> #include <sound/pcm.h> @@ -44,9 +44,6 @@ MODULE_LICENSE("GPL"); /*********************************

• DEFINES

********************************/ -#define PCI_VENDOR_ID_SAA7146 0x1131 -#define PCI_DEVICE_ID_SAA7146 0x7146

#define CTL_ROUTE_ANALOG 0 #define CTL_ROUTE_DIGITAL 1

@@ -165,7 +162,7 @@ module_param_array(enable, bool, NULL, 0444); MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");

static DEFINE_PCI_DEVICE_TABLE(snd_aw2_ids) = {

• {PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, 0, 0,

• {PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0, 0, 0, 0}, {0}

}; @@ -419,7 +416,7 @@ static int snd_aw2_pcm_playback_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime;

• snd_printdd(KERN_DEBUG "aw2: Playback_open \n");

• snd_printdd(KERN_DEBUG "aw2: Playback_open\n"); runtime->hw = snd_aw2_playback_hw; return 0;

} @@ -435,7 +432,7 @@ static int snd_aw2_pcm_capture_open(struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime;

• snd_printdd(KERN_DEBUG "aw2: Capture_open \n");

• snd_printdd(KERN_DEBUG "aw2: Capture_open\n"); runtime->hw = snd_aw2_capture_hw; return 0;

}