Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34329fae authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Takashi Iwai
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 4434ade8

sound/pci/aw2/aw2-alsa.c

+4 −7
Original line number Diff line number Diff line
@@ -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}

};