diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2010-05-21 17:35:03 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-25 08:39:28 +0200 |
| commit | 34329fae7f88c1d60ff94d5fed5a3bedcd6b2224 (patch) | |
| tree | 44507f2b889071c492d44fdd5788788957b32c59 /sound/pci/aw2/aw2-alsa.c | |
| parent | 4434ade8c9334a3ab975d8993de456f06841899e (diff) | |
| download | linux-stable-34329fae7f88c1d60ff94d5fed5a3bedcd6b2224.tar.gz linux-stable-34329fae7f88c1d60ff94d5fed5a3bedcd6b2224.tar.bz2 linux-stable-34329fae7f88c1d60ff94d5fed5a3bedcd6b2224.zip | |
ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/aw2/aw2-alsa.c')
| -rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 67921f93a41e..c15002242d98 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; } |