/* List of known platforms with no i915 support. */
static const struct pci_device_id denylist[] = {
/* CNL */
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), 0x030000, 0xff0000 },
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), 0x030000, 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a40), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a41), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a42), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a44), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a49), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4a), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a4c), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a50), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a51), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a52), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a54), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a59), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5a), .class = 0x030000, .class_mask = 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x5a5c), .class = 0x030000, .class_mask = 0xff0000 },
/* LKF */
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), 0x030000, 0xff0000 },
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x9840), .class = 0x030000, .class_mask = 0xff0000 },
{}
};
struct pci_dev *display_dev = NULL;
};
static const struct pci_device_id snd_ali_ids[] = {
- {PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451), 0, 0, 0},
- {0, }
+ { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5451) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_ali_ids);
};
static const struct pci_device_id snd_als300_ids[] = {
- { 0x4005, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300 },
- { 0x4005, 0x0308, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALS300_PLUS },
- { 0, }
+ { PCI_DEVICE(0x4005, 0x0300), .driver_data = DEVICE_ALS300 },
+ { PCI_DEVICE(0x4005, 0x0308), .driver_data = DEVICE_ALS300_PLUS },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_als300_ids);
};
static const struct pci_device_id snd_als4000_ids[] = {
- { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ALS4000 */
- { 0, }
+ { PCI_DEVICE(0x4005, 0x4000) }, /* ALS4000 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_als4000_ids);
}
static const struct pci_device_id asihpi_pci_tbl[] = {
- {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,
- HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0,
- (kernel_ulong_t)HPI_6205},
- {HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_PCI2040,
- HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0,
- (kernel_ulong_t)HPI_6000},
- {0,}
+ {
+ PCI_DEVICE_SUB(HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,
+ HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID),
+ .driver_data = (kernel_ulong_t)HPI_6205,
+ }, {
+ PCI_DEVICE_SUB(HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_PCI2040,
+ HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID),
+ .driver_data = (kernel_ulong_t)HPI_6000,
+ },
+ {}
};
MODULE_DEVICE_TABLE(pci, asihpi_pci_tbl);
*/
{
-HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,
- HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0,
- (kernel_ulong_t) HPI_6205}
-, {
-HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_PCI2040,
- HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID, 0, 0,
- (kernel_ulong_t) HPI_6000}
-, {
-0}
+ PCI_DEVICE_SUB(HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_DSP6205,
+ HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID),
+ .driver_data = (kernel_ulong_t) HPI_6205,
+}, {
+ PCI_DEVICE_SUB(HPI_PCI_VENDOR_ID_TI, HPI_PCI_DEV_ID_PCI2040,
+ HPI_PCI_VENDOR_ID_AUDIOSCIENCE, PCI_ANY_ID),
+ .driver_data = (kernel_ulong_t) HPI_6000,
+},
+{ }
/*
*/
static const struct pci_device_id snd_atiixp_ids[] = {
- { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */
- { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */
- { PCI_VDEVICE(ATI, 0x4370), 0 }, /* SB400 */
- { PCI_VDEVICE(ATI, 0x4382), 0 }, /* SB600 */
- { 0, }
+ { PCI_VDEVICE(ATI, 0x4341) }, /* SB200 */
+ { PCI_VDEVICE(ATI, 0x4361) }, /* SB300 */
+ { PCI_VDEVICE(ATI, 0x4370) }, /* SB400 */
+ { PCI_VDEVICE(ATI, 0x4382) }, /* SB600 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);
/*
*/
static const struct pci_device_id snd_atiixp_ids[] = {
- { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */
- { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */
- { 0, }
+ { PCI_VDEVICE(ATI, 0x434d) }, /* SB200 */
+ { PCI_VDEVICE(ATI, 0x4378) }, /* SB400 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_atiixp_ids);
#include "au8810.h"
#include "au88x0.h"
static const struct pci_device_id snd_vortex_ids[] = {
- {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},
- {0,}
+ { PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), .driver_data = 1 },
+ { }
};
#include "au88x0_core.c"
#include "au8820.h"
#include "au88x0.h"
static const struct pci_device_id snd_vortex_ids[] = {
- {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},
- {0,}
+ { PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), .driver_data = 0 },
+ { }
};
#include "au88x0_synth.c"
#include "au8830.h"
#include "au88x0.h"
static const struct pci_device_id snd_vortex_ids[] = {
- {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,},
- {0,}
+ { PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), .driver_data = 0 },
+ { }
};
#include "au88x0_synth.c"
MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");
static const struct pci_device_id snd_aw2_ids[] = {
- {PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0,
- 0, 0, 0},
- {0}
+ { PCI_DEVICE_SUB(PCI_VENDOR_ID_PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0, 0) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_aw2_ids);
};
static const struct pci_device_id snd_azf3328_ids[] = {
- { 0x122D, 0x50DC, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* PCI168/3328 */
- { 0x122D, 0x80DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* 3328 */
- { 0, }
+ { PCI_DEVICE(0x122D, 0x50DC) }, /* PCI168/3328 */
+ { PCI_DEVICE(0x122D, 0x80DA) }, /* 3328 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_azf3328_ids);
// PCI IDs
static const struct pci_device_id snd_ca0106_ids[] = {
- { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */
- { 0, }
+ { PCI_VDEVICE(CREATIVE, 0x0007) }, /* Audigy LS or Live 24bit */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
}
static const struct pci_device_id snd_cmipci_ids[] = {
- {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},
- {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B), 0},
- {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738), 0},
- {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738B), 0},
- {PCI_VDEVICE(AL, PCI_DEVICE_ID_CMEDIA_CM8738), 0},
- {0,},
+ {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A) },
+ {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B) },
+ {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738) },
+ {PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738B) },
+ {PCI_VDEVICE(AL, PCI_DEVICE_ID_CMEDIA_CM8738) },
+ { }
};
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
static const struct pci_device_id snd_cs4281_ids[] = {
- { PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */
- { 0, }
+ { PCI_VDEVICE(CIRRUS, 0x6005) }, /* CS4281 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_cs4281_ids);
MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");
static const struct pci_device_id snd_cs46xx_ids[] = {
- { PCI_VDEVICE(CIRRUS, 0x6001), 0, }, /* CS4280 */
- { PCI_VDEVICE(CIRRUS, 0x6003), 0, }, /* CS4612 */
- { PCI_VDEVICE(CIRRUS, 0x6004), 0, }, /* CS4615 */
- { 0, }
+ { PCI_VDEVICE(CIRRUS, 0x6001) }, /* CS4280 */
+ { PCI_VDEVICE(CIRRUS, 0x6003) }, /* CS4612 */
+ { PCI_VDEVICE(CIRRUS, 0x6004) }, /* CS4615 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_cs46xx_ids);
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0010, 0, 0, 0}, /* DSP 56301 Darla20 rev.0 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0010) }, /* DSP 56301 Darla20 rev.0 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0040, 0, 0, 0}, /* DSP 56301 Darla24 rev.0 */
- {0x1057, 0x1801, 0xECC0, 0x0041, 0, 0, 0}, /* DSP 56301 Darla24 rev.1 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0040) }, /* DSP 56301 Darla24 rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0041) }, /* DSP 56301 Darla24 rev.1 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x0100, 0, 0, 0}, /* Echo 3G */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0100) }, /* Echo 3G */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0020, 0, 0, 0}, /* DSP 56301 Gina20 rev.0 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0020) }, /* DSP 56301 Gina20 rev.0 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56301 Gina24 rev.0 */
- {0x1057, 0x1801, 0xECC0, 0x0051, 0, 0, 0}, /* DSP 56301 Gina24 rev.1 */
- {0x1057, 0x3410, 0xECC0, 0x0050, 0, 0, 0}, /* DSP 56361 Gina24 rev.0 */
- {0x1057, 0x3410, 0xECC0, 0x0051, 0, 0, 0}, /* DSP 56361 Gina24 rev.1 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0050) }, /* DSP 56301 Gina24 rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0051) }, /* DSP 56301 Gina24 rev.1 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0050) }, /* DSP 56361 Gina24 rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0051) }, /* DSP 56361 Gina24 rev.1 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x0090, 0, 0, 0}, /* Indigo */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0090) }, /* Indigo */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0}, /* Indigo DJ*/
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x00B0) }, /* Indigo DJ*/
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx*/
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x00E0) }, /* Indigo DJx*/
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0}, /* Indigo IO*/
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x00A0) }, /* Indigo IO*/
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0}, /* Indigo IOx */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x00D0) }, /* Indigo IOx */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0030, 0, 0, 0}, /* DSP 56301 Layla20 rev.0 */
- {0x1057, 0x1801, 0xECC0, 0x0031, 0, 0, 0}, /* DSP 56301 Layla20 rev.1 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0030) }, /* DSP 56301 Layla20 rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0031) }, /* DSP 56301 Layla20 rev.1 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x0060, 0, 0, 0}, /* DSP 56361 Layla24 rev.0 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0060) }, /* DSP 56361 Layla24 rev.0 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x3410, 0xECC0, 0x0080, 0, 0, 0}, /* DSP 56361 Mia rev.0 */
- {0x1057, 0x3410, 0xECC0, 0x0081, 0, 0, 0}, /* DSP 56361 Mia rev.1 */
- {0,}
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0080) }, /* DSP 56361 Mia rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0081) }, /* DSP 56361 Mia rev.1 */
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
};
static const struct pci_device_id snd_echo_ids[] = {
- {0x1057, 0x1801, 0xECC0, 0x0070, 0, 0, 0}, /* DSP 56301 Mona rev.0 */
- {0x1057, 0x1801, 0xECC0, 0x0071, 0, 0, 0}, /* DSP 56301 Mona rev.1 */
- {0x1057, 0x1801, 0xECC0, 0x0072, 0, 0, 0}, /* DSP 56301 Mona rev.2 */
- {0x1057, 0x3410, 0xECC0, 0x0070, 0, 0, 0}, /* DSP 56361 Mona rev.0 */
- {0x1057, 0x3410, 0xECC0, 0x0071, 0, 0, 0}, /* DSP 56361 Mona rev.1 */
- {0x1057, 0x3410, 0xECC0, 0x0072, 0, 0, 0}, /* DSP 56361 Mona rev.2 */
- {0,}
+ /* DSP 56301 Mona rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0070) },
+ /* DSP 56301 Mona rev.1 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0071) },
+ /* DSP 56301 Mona rev.2 */
+ { PCI_DEVICE_SUB(0x1057, 0x1801, 0xECC0, 0x0072) },
+ /* DSP 56361 Mona rev.0 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0070) },
+ /* DSP 56361 Mona rev.1 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0071) },
+ /* DSP 56361 Mona rev.2 */
+ { PCI_DEVICE_SUB(0x1057, 0x3410, 0xECC0, 0x0072) },
+ { }
};
static const struct snd_pcm_hardware pcm_hardware_skel = {
* Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400
*/
static const struct pci_device_id snd_emu10k1_ids[] = {
- { PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */
- { PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */
- { PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */
- { 0, }
+ { PCI_VDEVICE(CREATIVE, 0x0002), .driver_data = 0 }, /* EMU10K1 */
+ { PCI_VDEVICE(CREATIVE, 0x0004), .driver_data = 1 }, /* Audigy */
+ { PCI_VDEVICE(CREATIVE, 0x0008), .driver_data = 1 }, /* Audigy 2 Value SB0400 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);
// PCI IDs
static const struct pci_device_id snd_emu10k1x_ids[] = {
- { PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */
- { 0, }
+ { PCI_VDEVICE(CREATIVE, 0x0006) }, /* Dell OEM version (EMU10K1) */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
static const struct pci_device_id snd_audiopci_ids[] = {
#ifdef CHIP1370
- { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
+ { PCI_VDEVICE(ENSONIQ, 0x5000) }, /* ES1370 */
#endif
#ifdef CHIP1371
- { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
- { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
- { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
+ { PCI_VDEVICE(ENSONIQ, 0x1371) }, /* ES1371 */
+ { PCI_VDEVICE(ENSONIQ, 0x5880) }, /* ES1373 - CT5880 */
+ { PCI_VDEVICE(ECTIVA, 0x8938) }, /* Ectiva EV1938 */
#endif
- { 0, }
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);
static const struct pci_device_id snd_es1938_ids[] = {
- { PCI_VDEVICE(ESS, 0x1969), 0, }, /* Solo-1 */
- { 0, }
+ { PCI_VDEVICE(ESS, 0x1969) }, /* Solo-1 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_es1938_ids);
static irqreturn_t snd_es1968_interrupt(int irq, void *dev_id);
static const struct pci_device_id snd_es1968_ids[] = {
- /* Maestro 1 */
- { 0x1285, 0x0100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO },
- /* Maestro 2 */
- { 0x125d, 0x1968, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO2 },
- /* Maestro 2E */
- { 0x125d, 0x1978, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, TYPE_MAESTRO2E },
- { 0, }
+ {
+ /* Maestro 1 */
+ PCI_DEVICE(0x1285, 0x0100),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ .driver_data = TYPE_MAESTRO,
+ }, {
+ /* Maestro 2 */
+ PCI_DEVICE(0x125d, 0x1968),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ .driver_data = TYPE_MAESTRO2,
+ }, {
+ /* Maestro 2E */
+ PCI_DEVICE(0x125d, 0x1978),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ .driver_data = TYPE_MAESTRO2E,
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_es1968_ids);
}
static const struct pci_device_id snd_fm801_ids[] = {
- { 0x1319, 0x0801, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* FM801 */
- { 0x5213, 0x0510, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0, }, /* Gallant Odyssey Sound 4 */
- { 0, }
+ {
+ /* FM801 */
+ PCI_DEVICE(0x1319, 0x0801),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ /* Gallant Odyssey Sound 4 */
+ PCI_DEVICE(0x5213, 0x0510),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_fm801_ids);
static const struct pci_device_id snd_ice1712_ids[] = {
- { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 }, /* ICE1712 */
- { 0, }
+ { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712) }, /* ICE1712 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_ice1712_ids);
/* Both VT1720 and VT1724 have the same PCI IDs */
static const struct pci_device_id snd_vt1724_ids[] = {
- { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 },
- { 0, }
+ { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_vt1724_ids);
};
static const struct pci_device_id snd_intel8x0_ids[] = {
- { PCI_VDEVICE(INTEL, 0x2415), DEVICE_INTEL }, /* 82801AA */
- { PCI_VDEVICE(INTEL, 0x2425), DEVICE_INTEL }, /* 82901AB */
- { PCI_VDEVICE(INTEL, 0x2445), DEVICE_INTEL }, /* 82801BA */
- { PCI_VDEVICE(INTEL, 0x2485), DEVICE_INTEL }, /* ICH3 */
- { PCI_VDEVICE(INTEL, 0x24c5), DEVICE_INTEL_ICH4 }, /* ICH4 */
- { PCI_VDEVICE(INTEL, 0x24d5), DEVICE_INTEL_ICH4 }, /* ICH5 */
- { PCI_VDEVICE(INTEL, 0x25a6), DEVICE_INTEL_ICH4 }, /* ESB */
- { PCI_VDEVICE(INTEL, 0x266e), DEVICE_INTEL_ICH4 }, /* ICH6 */
- { PCI_VDEVICE(INTEL, 0x27de), DEVICE_INTEL_ICH4 }, /* ICH7 */
- { PCI_VDEVICE(INTEL, 0x2698), DEVICE_INTEL_ICH4 }, /* ESB2 */
- { PCI_VDEVICE(INTEL, 0x7195), DEVICE_INTEL }, /* 440MX */
- { PCI_VDEVICE(SI, 0x7012), DEVICE_SIS }, /* SI7012 */
- { PCI_VDEVICE(NVIDIA, 0x01b1), DEVICE_NFORCE }, /* NFORCE */
- { PCI_VDEVICE(NVIDIA, 0x003a), DEVICE_NFORCE }, /* MCP04 */
- { PCI_VDEVICE(NVIDIA, 0x006a), DEVICE_NFORCE }, /* NFORCE2 */
- { PCI_VDEVICE(NVIDIA, 0x0059), DEVICE_NFORCE }, /* CK804 */
- { PCI_VDEVICE(NVIDIA, 0x008a), DEVICE_NFORCE }, /* CK8 */
- { PCI_VDEVICE(NVIDIA, 0x00da), DEVICE_NFORCE }, /* NFORCE3 */
- { PCI_VDEVICE(NVIDIA, 0x00ea), DEVICE_NFORCE }, /* CK8S */
- { PCI_VDEVICE(NVIDIA, 0x026b), DEVICE_NFORCE }, /* MCP51 */
- { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
- { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
- { 0, }
+ {
+ /* 82801AA */
+ PCI_VDEVICE(INTEL, 0x2415),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* 82901AB */
+ PCI_VDEVICE(INTEL, 0x2425),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* 82801BA */
+ PCI_VDEVICE(INTEL, 0x2445),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* ICH3 */
+ PCI_VDEVICE(INTEL, 0x2485),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* ICH4 */
+ PCI_VDEVICE(INTEL, 0x24c5),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* ICH5 */
+ PCI_VDEVICE(INTEL, 0x24d5),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* ESB */
+ PCI_VDEVICE(INTEL, 0x25a6),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* ICH6 */
+ PCI_VDEVICE(INTEL, 0x266e),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* ICH7 */
+ PCI_VDEVICE(INTEL, 0x27de),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* ESB2 */
+ PCI_VDEVICE(INTEL, 0x2698),
+ .driver_data = DEVICE_INTEL_ICH4,
+ }, {
+ /* 440MX */
+ PCI_VDEVICE(INTEL, 0x7195),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* SI7012 */
+ PCI_VDEVICE(SI, 0x7012),
+ .driver_data = DEVICE_SIS,
+ }, {
+ /* NFORCE */
+ PCI_VDEVICE(NVIDIA, 0x01b1),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* MCP04 */
+ PCI_VDEVICE(NVIDIA, 0x003a),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* NFORCE2 */
+ PCI_VDEVICE(NVIDIA, 0x006a),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* CK804 */
+ PCI_VDEVICE(NVIDIA, 0x0059),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* CK8 */
+ PCI_VDEVICE(NVIDIA, 0x008a),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* NFORCE3 */
+ PCI_VDEVICE(NVIDIA, 0x00da),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* CK8S */
+ PCI_VDEVICE(NVIDIA, 0x00ea),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* MCP51 */
+ PCI_VDEVICE(NVIDIA, 0x026b),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* AMD8111 */
+ PCI_VDEVICE(AMD, 0x746d),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* AMD768 */
+ PCI_VDEVICE(AMD, 0x7445),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* Ali5455 */
+ PCI_VDEVICE(AL, 0x5455),
+ .driver_data = DEVICE_ALI,
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids);
};
static const struct pci_device_id snd_intel8x0m_ids[] = {
- { PCI_VDEVICE(INTEL, 0x2416), DEVICE_INTEL }, /* 82801AA */
- { PCI_VDEVICE(INTEL, 0x2426), DEVICE_INTEL }, /* 82901AB */
- { PCI_VDEVICE(INTEL, 0x2446), DEVICE_INTEL }, /* 82801BA */
- { PCI_VDEVICE(INTEL, 0x2486), DEVICE_INTEL }, /* ICH3 */
- { PCI_VDEVICE(INTEL, 0x24c6), DEVICE_INTEL }, /* ICH4 */
- { PCI_VDEVICE(INTEL, 0x24d6), DEVICE_INTEL }, /* ICH5 */
- { PCI_VDEVICE(INTEL, 0x266d), DEVICE_INTEL }, /* ICH6 */
- { PCI_VDEVICE(INTEL, 0x27dd), DEVICE_INTEL }, /* ICH7 */
- { PCI_VDEVICE(INTEL, 0x7196), DEVICE_INTEL }, /* 440MX */
- { PCI_VDEVICE(AMD, 0x7446), DEVICE_INTEL }, /* AMD768 */
- { PCI_VDEVICE(SI, 0x7013), DEVICE_SIS }, /* SI7013 */
- { PCI_VDEVICE(NVIDIA, 0x01c1), DEVICE_NFORCE }, /* NFORCE */
- { PCI_VDEVICE(NVIDIA, 0x0069), DEVICE_NFORCE }, /* NFORCE2 */
- { PCI_VDEVICE(NVIDIA, 0x0089), DEVICE_NFORCE }, /* NFORCE2s */
- { PCI_VDEVICE(NVIDIA, 0x00d9), DEVICE_NFORCE }, /* NFORCE3 */
- { PCI_VDEVICE(AMD, 0x746e), DEVICE_INTEL }, /* AMD8111 */
+ {
+ /* 82801AA */
+ PCI_VDEVICE(INTEL, 0x2416),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* 82901AB */
+ PCI_VDEVICE(INTEL, 0x2426),
+ .driver_data = DEVICE_INTEL
+ }, {
+ /* 82801BA */
+ PCI_VDEVICE(INTEL, 0x2446),
+ .driver_data = DEVICE_INTEL
+ }, {
+ /* ICH3 */
+ PCI_VDEVICE(INTEL, 0x2486),
+ .driver_data = DEVICE_INTEL
+ }, {
+ /* ICH4 */
+ PCI_VDEVICE(INTEL, 0x24c6),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* ICH5 */
+ PCI_VDEVICE(INTEL, 0x24d6),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* ICH6 */
+ PCI_VDEVICE(INTEL, 0x266d),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* ICH7 */
+ PCI_VDEVICE(INTEL, 0x27dd),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* 440MX */
+ PCI_VDEVICE(INTEL, 0x7196),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* AMD768 */
+ PCI_VDEVICE(AMD, 0x7446),
+ .driver_data = DEVICE_INTEL,
+ }, {
+ /* SI7013 */
+ PCI_VDEVICE(SI, 0x7013),
+ .driver_data = DEVICE_SIS,
+ }, {
+ /* NFORCE */
+ PCI_VDEVICE(NVIDIA, 0x01c1),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* NFORCE2 */
+ PCI_VDEVICE(NVIDIA, 0x0069),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* NFORCE2s */
+ PCI_VDEVICE(NVIDIA, 0x0089),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* NFORCE3 */
+ PCI_VDEVICE(NVIDIA, 0x00d9),
+ .driver_data = DEVICE_NFORCE,
+ }, {
+ /* AMD8111 */
+ PCI_VDEVICE(AMD, 0x746e),
+ .driver_data = DEVICE_INTEL
#if 0
- { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
+ }, {
+ /* Ali5455 */
+ PCI_VDEVICE(AL, 0x5455),
+ .driver_data = DEVICE_ALI,
#endif
- { 0, }
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids);
* pci ids
*/
static const struct pci_device_id snd_m3_ids[] = {
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_CANYON3D_2LE, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_CANYON3D_2, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_1, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_HW, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_2, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {0,},
+ {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO_1),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_ALLEGRO),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_CANYON3D_2LE),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_CANYON3D_2),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_1),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_HW),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_ESS, PCI_DEVICE_ID_ESS_MAESTRO3_2),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ },
+ { },
};
MODULE_DEVICE_TABLE(pci, snd_m3_ids);
*/
static const struct pci_device_id snd_mixart_ids[] = {
- { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */
- { 0, }
+ { PCI_VDEVICE(MOTOROLA, 0x0003) }, /* MC8240 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_mixart_ids);
* PCI ids
*/
static const struct pci_device_id snd_nm256_ids[] = {
- {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO), 0},
- {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO), 0},
- {PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO), 0},
- {0,},
+ { PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO) },
+ { PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO) },
+ { PCI_VDEVICE(NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO) },
+ { },
};
MODULE_DEVICE_TABLE(pci, snd_nm256_ids);
};
static const struct pci_device_id pcxhr_ids[] = {
- { 0x10b5, 0x9656, 0x1369, 0xb001, 0, 0, PCI_ID_VX882HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb101, 0, 0, PCI_ID_PCX882HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb201, 0, 0, PCI_ID_VX881HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb301, 0, 0, PCI_ID_PCX881HR, },
- { 0x10b5, 0x9056, 0x1369, 0xb021, 0, 0, PCI_ID_VX882E, },
- { 0x10b5, 0x9056, 0x1369, 0xb121, 0, 0, PCI_ID_PCX882E, },
- { 0x10b5, 0x9056, 0x1369, 0xb221, 0, 0, PCI_ID_VX881E, },
- { 0x10b5, 0x9056, 0x1369, 0xb321, 0, 0, PCI_ID_PCX881E, },
- { 0x10b5, 0x9656, 0x1369, 0xb401, 0, 0, PCI_ID_VX1222HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb501, 0, 0, PCI_ID_PCX1222HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb601, 0, 0, PCI_ID_VX1221HR, },
- { 0x10b5, 0x9656, 0x1369, 0xb701, 0, 0, PCI_ID_PCX1221HR, },
- { 0x10b5, 0x9056, 0x1369, 0xb421, 0, 0, PCI_ID_VX1222E, },
- { 0x10b5, 0x9056, 0x1369, 0xb521, 0, 0, PCI_ID_PCX1222E, },
- { 0x10b5, 0x9056, 0x1369, 0xb621, 0, 0, PCI_ID_VX1221E, },
- { 0x10b5, 0x9056, 0x1369, 0xb721, 0, 0, PCI_ID_PCX1221E, },
- { 0x10b5, 0x9056, 0x1369, 0xba01, 0, 0, PCI_ID_VX222HR, },
- { 0x10b5, 0x9056, 0x1369, 0xba21, 0, 0, PCI_ID_VX222E, },
- { 0x10b5, 0x9056, 0x1369, 0xbd01, 0, 0, PCI_ID_PCX22HR, },
- { 0x10b5, 0x9056, 0x1369, 0xbd21, 0, 0, PCI_ID_PCX22E, },
- { 0x10b5, 0x9056, 0x1369, 0xbc01, 0, 0, PCI_ID_VX222HRMIC, },
- { 0x10b5, 0x9056, 0x1369, 0xbc21, 0, 0, PCI_ID_VX222E_MIC, },
- { 0x10b5, 0x9056, 0x1369, 0xbb01, 0, 0, PCI_ID_PCX924HR, },
- { 0x10b5, 0x9056, 0x1369, 0xbb21, 0, 0, PCI_ID_PCX924E, },
- { 0x10b5, 0x9056, 0x1369, 0xbf01, 0, 0, PCI_ID_PCX924HRMIC, },
- { 0x10b5, 0x9056, 0x1369, 0xbf21, 0, 0, PCI_ID_PCX924E_MIC, },
- { 0x10b5, 0x9656, 0x1369, 0xd001, 0, 0, PCI_ID_VX442HR, },
- { 0x10b5, 0x9656, 0x1369, 0xd101, 0, 0, PCI_ID_PCX442HR, },
- { 0x10b5, 0x9056, 0x1369, 0xd021, 0, 0, PCI_ID_VX442E, },
- { 0x10b5, 0x9056, 0x1369, 0xd121, 0, 0, PCI_ID_PCX442E, },
- { 0x10b5, 0x9656, 0x1369, 0xd201, 0, 0, PCI_ID_VX822HR, },
- { 0x10b5, 0x9656, 0x1369, 0xd301, 0, 0, PCI_ID_PCX822HR, },
- { 0x10b5, 0x9056, 0x1369, 0xd221, 0, 0, PCI_ID_VX822E, },
- { 0x10b5, 0x9056, 0x1369, 0xd321, 0, 0, PCI_ID_PCX822E, },
- { 0, }
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb001), .driver_data = PCI_ID_VX882HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb101), .driver_data = PCI_ID_PCX882HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb201), .driver_data = PCI_ID_VX881HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb301), .driver_data = PCI_ID_PCX881HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb021), .driver_data = PCI_ID_VX882E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb121), .driver_data = PCI_ID_PCX882E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb221), .driver_data = PCI_ID_VX881E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb321), .driver_data = PCI_ID_PCX881E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb401), .driver_data = PCI_ID_VX1222HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb501), .driver_data = PCI_ID_PCX1222HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb601), .driver_data = PCI_ID_VX1221HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xb701), .driver_data = PCI_ID_PCX1221HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb421), .driver_data = PCI_ID_VX1222E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb521), .driver_data = PCI_ID_PCX1222E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb621), .driver_data = PCI_ID_VX1221E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xb721), .driver_data = PCI_ID_PCX1221E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xba01), .driver_data = PCI_ID_VX222HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xba21), .driver_data = PCI_ID_VX222E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbd01), .driver_data = PCI_ID_PCX22HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbd21), .driver_data = PCI_ID_PCX22E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbc01), .driver_data = PCI_ID_VX222HRMIC },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbc21), .driver_data = PCI_ID_VX222E_MIC },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbb01), .driver_data = PCI_ID_PCX924HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbb21), .driver_data = PCI_ID_PCX924E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbf01), .driver_data = PCI_ID_PCX924HRMIC },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xbf21), .driver_data = PCI_ID_PCX924E_MIC },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xd001), .driver_data = PCI_ID_VX442HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xd101), .driver_data = PCI_ID_PCX442HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xd021), .driver_data = PCI_ID_VX442E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xd121), .driver_data = PCI_ID_PCX442E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xd201), .driver_data = PCI_ID_VX822HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9656, 0x1369, 0xd301), .driver_data = PCI_ID_PCX822HR },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xd221), .driver_data = PCI_ID_VX822E },
+ { PCI_DEVICE_SUB(0x10b5, 0x9056, 0x1369, 0xd321), .driver_data = PCI_ID_PCX822E },
+ { }
};
MODULE_DEVICE_TABLE(pci, pcxhr_ids);
};
static const struct pci_device_id snd_rme32_ids[] = {
- {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32), 0,},
- {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8), 0,},
- {PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO), 0,},
- {0,}
+ { PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32) },
+ { PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8) },
+ { PCI_VDEVICE(XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_rme32_ids);
};
static const struct pci_device_id snd_rme96_ids[] = {
- { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96), 0, },
- { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8), 0, },
- { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO), 0, },
- { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST), 0, },
- { 0, }
+ { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96) },
+ { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8) },
+ { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO) },
+ { PCI_VDEVICE(XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_rme96_ids);
};
static const struct pci_device_id snd_sonic_ids[] = {
- { PCI_VDEVICE(S3, 0xca00), 0, },
- { 0, }
+ { PCI_VDEVICE(S3, 0xca00) },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_sonic_ids);
MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth.");
static const struct pci_device_id snd_trident_ids[] = {
- {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX),
- PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
- {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX),
- 0, 0, 0},
- {PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018), 0, 0, 0},
- { 0, }
+ {
+ PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX),
+ .class = PCI_CLASS_MULTIMEDIA_AUDIO << 8,
+ .class_mask = 0xffff00,
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX),
+ }, {
+ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018)
+ },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_trident_ids);
static const struct pci_device_id snd_via82xx_ids[] = {
/* 0x1106, 0x3058 */
- { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */
+ { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), .driver_data = TYPE_CARD_VIA686 }, /* 686A */
/* 0x1106, 0x3059 */
- { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_5), TYPE_CARD_VIA8233, }, /* VT8233 */
- { 0, }
+ { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_5), .driver_data = TYPE_CARD_VIA8233 }, /* VT8233 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_via82xx_ids);
};
static const struct pci_device_id snd_via82xx_modem_ids[] = {
- { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, },
- { 0, }
+ { PCI_VDEVICE(VIA, 0x3068), .driver_data = TYPE_CARD_VIA82XX_MODEM },
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_via82xx_modem_ids);
};
static const struct pci_device_id snd_vx222_ids[] = {
- { 0x10b5, 0x9050, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_OLD, }, /* PLX */
- { 0x10b5, 0x9030, 0x1369, PCI_ANY_ID, 0, 0, VX_PCI_VX222_NEW, }, /* PLX */
- { 0, }
+ { PCI_DEVICE_SUB(0x10b5, 0x9050, 0x1369, PCI_ANY_ID), .driver_data = VX_PCI_VX222_OLD }, /* PLX */
+ { PCI_DEVICE_SUB(0x10b5, 0x9030, 0x1369, PCI_ANY_ID), .driver_data = VX_PCI_VX222_NEW }, /* PLX */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_vx222_ids);
MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
static const struct pci_device_id snd_ymfpci_ids[] = {
- { PCI_VDEVICE(YAMAHA, 0x0004), 0, }, /* YMF724 */
- { PCI_VDEVICE(YAMAHA, 0x000d), 0, }, /* YMF724F */
- { PCI_VDEVICE(YAMAHA, 0x000a), 0, }, /* YMF740 */
- { PCI_VDEVICE(YAMAHA, 0x000c), 0, }, /* YMF740C */
- { PCI_VDEVICE(YAMAHA, 0x0010), 0, }, /* YMF744 */
- { PCI_VDEVICE(YAMAHA, 0x0012), 0, }, /* YMF754 */
- { 0, }
+ { PCI_VDEVICE(YAMAHA, 0x0004) }, /* YMF724 */
+ { PCI_VDEVICE(YAMAHA, 0x000d) }, /* YMF724F */
+ { PCI_VDEVICE(YAMAHA, 0x000a) }, /* YMF740 */
+ { PCI_VDEVICE(YAMAHA, 0x000c) }, /* YMF740C */
+ { PCI_VDEVICE(YAMAHA, 0x0010) }, /* YMF744 */
+ { PCI_VDEVICE(YAMAHA, 0x0012) }, /* YMF754 */
+ { }
};
MODULE_DEVICE_TABLE(pci, snd_ymfpci_ids);
projects / thirdparty / linux.git / commitdiff
