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

Commit 8cdfd251 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Remove superfluous PCI ID definitions 



CS46xx driver,EMU10K1/EMU10K2 driver,PCM Midlevel,Trident driver
YMFPCI driver,BT87x driver,CMIPCI driver,CS4281 driver
ENS1370/1+ driver,ES1938 driver,ES1968 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,RME32 driver,RME96 driver
SonicVibes driver,VIA82xx driver,ALI5451 driver,ICE1712 driver
ICE1724 driver,NM256 driver,RME HDSP driver,RME9652 driver
Remove superfluous PCI ID definitions.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent df8db936

include/sound/cs46xx.h

+0 −13
Original line number Diff line number Diff line
@@ -29,19 +29,6 @@ 
#include "ac97_codec.h"

#include "cs46xx_dsp_spos.h"



#ifndef PCI_VENDOR_ID_CIRRUS

#define PCI_VENDOR_ID_CIRRUS            0x1013

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4610

#define PCI_DEVICE_ID_CIRRUS_4610       0x6001

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4612

#define PCI_DEVICE_ID_CIRRUS_4612       0x6003

#endif

#ifndef PCI_DEVICE_ID_CIRRUS_4615

#define PCI_DEVICE_ID_CIRRUS_4615       0x6004

#endif



/*

 *  Direct registers

 */

include/sound/emu10k1.h

+0 −7
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ 
#include <linux/interrupt.h>

#include <asm/io.h>



#ifndef PCI_VENDOR_ID_CREATIVE

#define PCI_VENDOR_ID_CREATIVE		0x1102

#endif

#ifndef PCI_DEVICE_ID_CREATIVE_EMU10K1

#define PCI_DEVICE_ID_CREATIVE_EMU10K1	0x0002

#endif



/* ------------------- DEFINES -------------------- */



#define EMUPAGESIZE     4096

include/sound/pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ int snd_pcm_format_big_endian(snd_pcm_format_t format); 
 * Returns 1 if the given PCM format is CPU-endian, 0 if

 * opposite, or a negative error code if endian not specified.

 */

int snd_pcm_format_cpu_endian(snd_pcm_format_t format);

#ifdef SNDRV_LITTLE_ENDIAN

#define snd_pcm_format_cpu_endian(format) snd_pcm_format_little_endian(format)

#else

include/sound/trident.h

+0 −17
Original line number Diff line number Diff line
@@ -33,23 +33,6 @@ 
//#include "ainstr_gf1.h"

#include "ainstr_simple.h"



#ifndef PCI_VENDOR_ID_TRIDENT

#define PCI_VENDOR_ID_TRIDENT		0x1023

#endif

#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 

#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000

#endif

#ifndef PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 

#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001

#endif



#ifndef PCI_VENDOR_ID_SI

#define PCI_VENDOR_ID_SI		0x1039

#endif

#ifndef PCI_DEVICE_ID_SI_7018

#define PCI_DEVICE_ID_SI_7018		0x7018

#endif



#define TRIDENT_DEVICE_ID_DX		((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_DX)

#define TRIDENT_DEVICE_ID_NX		((PCI_VENDOR_ID_TRIDENT<<16)|PCI_DEVICE_ID_TRIDENT_4DWAVE_NX)

#define TRIDENT_DEVICE_ID_SI7018	((PCI_VENDOR_ID_SI<<16)|PCI_DEVICE_ID_SI_7018)

include/sound/ymfpci.h

+0 −22
Original line number Diff line number Diff line
@@ -28,28 +28,6 @@ 
#include "timer.h"

#include <linux/gameport.h>



#ifndef PCI_VENDOR_ID_YAMAHA

#define PCI_VENDOR_ID_YAMAHA            0x1073

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_724

#define PCI_DEVICE_ID_YAMAHA_724	0x0004

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_724F

#define PCI_DEVICE_ID_YAMAHA_724F	0x000d

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_740

#define PCI_DEVICE_ID_YAMAHA_740	0x000a

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_740C

#define PCI_DEVICE_ID_YAMAHA_740C	0x000c

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_744

#define PCI_DEVICE_ID_YAMAHA_744	0x0010

#endif

#ifndef PCI_DEVICE_ID_YAMAHA_754

#define PCI_DEVICE_ID_YAMAHA_754	0x0012

#endif



/*

 *  Direct registers

 */