mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-27 16:28:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: pci: Use PCI_DEVICE macros and drop zeros from pci_device_id arrays

Browse Source 
Some pci_device_id arrays already used the PCI_DEVICE macros, others
used named initializers or list initializers. Unify all to use the
PCI_DEVICE macros and (if applicable) a named initializer for
.driver_data. Also drop all zeros that the compiler can care for and
unify indention and spacing.

Signed-off-by: Uwe Kleine-König (The Capable Hub) <u.kleine-koenig@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
This commit is contained in:
Uwe Kleine-König (The Capable Hub)
2026-06-29 19:12:54 +02:00
committed by Hans Verkuil
parent dd5f981d02
commit 007b61981a
33 changed files with 790 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/pci/bt8xx/bttv-driver.c
View File

@@ -3563,12 +3563,12 @@ static int __maybe_unused bttv_resume(struct device *dev)
}
static const struct pci_device_id bttv_pci_tbl[] = {
{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT848), 0},
{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0},
{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0},
{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0},
{PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879), 0},
{0,}
{ PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT848) },
{ PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849) },
{ PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878) },
{ PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879) },
{ PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879) },
{ }
};
MODULE_DEVICE_TABLE(pci, bttv_pci_tbl);

5
drivers/media/pci/cobalt/cobalt-driver.c
View File

@@ -26,9 +26,8 @@
/* add your revision and whatnot here */
static const struct pci_device_id cobalt_pci_tbl[] = {
{PCI_VENDOR_ID_CISCO, PCI_DEVICE_ID_COBALT,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,}
{ PCI_VDEVICE(CISCO, PCI_DEVICE_ID_COBALT) },
{ }
};
MODULE_DEVICE_TABLE(pci, cobalt_pci_tbl);

5
drivers/media/pci/cx18/cx18-driver.c
View File

@@ -40,9 +40,8 @@ EXPORT_SYMBOL(cx18_ext_init);
/* add your revision and whatnot here */
static const struct pci_device_id cx18_pci_tbl[] = {
{PCI_VENDOR_ID_CX, PCI_DEVICE_ID_CX23418,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,}
{ PCI_VDEVICE(CX, PCI_DEVICE_ID_CX23418) },
{ }
};
MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);

10
drivers/media/pci/cx23885/cx23885-core.c
View File

@@ -2279,16 +2279,10 @@ static int __maybe_unused cx23885_resume(struct device *dev_d)
static const struct pci_device_id cx23885_pci_tbl[] = {
{
/* CX23885 */
.vendor = 0x14f1,
.device = 0x8852,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_DEVICE(0x14f1, 0x8852),
}, {
/* CX23887 Rev 2 */
.vendor = 0x14f1,
.device = 0x8880,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_DEVICE(0x14f1, 0x8880),
}, {
/* --- end of list --- */
}

4
drivers/media/pci/cx25821/cx25821-alsa.c
View File

@@ -681,8 +681,8 @@ static int snd_cx25821_pcm(struct cx25821_audio_dev *chip, int device,
*/
static const struct pci_device_id __maybe_unused cx25821_audio_pci_tbl[] = {
{0x14f1, 0x0920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,}
{ PCI_DEVICE(0x14f1, 0x0920) },
{ }
};
MODULE_DEVICE_TABLE(pci, cx25821_audio_pci_tbl);

10
drivers/media/pci/cx25821/cx25821-core.c
View File

@@ -1347,16 +1347,10 @@ static void cx25821_finidev(struct pci_dev *pci_dev)
static const struct pci_device_id cx25821_pci_tbl[] = {
{
/* CX25821 Athena */
.vendor = 0x14f1,
.device = 0x8210,
.subvendor = 0x14f1,
.subdevice = 0x0920,
PCI_DEVICE_SUB(0x14f1, 0x8210, 0x14f1, 0x0920),
}, {
/* CX25821 No Brand */
.vendor = 0x14f1,
.device = 0x8210,
.subvendor = 0x0000,
.subdevice = 0x0000,
PCI_DEVICE_SUB(0x14f1, 0x8210, 0x0000, 0x0000),
}, {
/* --- end of list --- */
}

6
drivers/media/pci/cx88/cx88-alsa.c
View File

@@ -809,9 +809,9 @@ static const struct snd_kcontrol_new snd_cx88_alc_switch = {
*/
static const struct pci_device_id cx88_audio_pci_tbl[] = {
{0x14f1, 0x8801, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0x14f1, 0x8811, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0, }
{ PCI_DEVICE(0x14f1, 0x8801) },
{ PCI_DEVICE(0x14f1, 0x8811) },
{ }
};
MODULE_DEVICE_TABLE(pci, cx88_audio_pci_tbl);

5
drivers/media/pci/cx88/cx88-mpeg.c
View File

@@ -787,10 +787,7 @@ static void cx8802_remove(struct pci_dev *pci_dev)
static const struct pci_device_id cx8802_pci_tbl[] = {
{
.vendor = 0x14f1,
.device = 0x8802,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_DEVICE(0x14f1, 0x8802),
}, {
/* --- end of list --- */
}

5
drivers/media/pci/cx88/cx88-video.c
View File

@@ -1610,10 +1610,7 @@ static int __maybe_unused cx8800_resume(struct device *dev_d)
static const struct pci_device_id cx8800_pci_tbl[] = {
{
.vendor = 0x14f1,
.device = 0x8800,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_DEVICE(0x14f1, 0x8800),
}, {
/* --- end of list --- */
}

2
drivers/media/pci/ddbridge/ddbridge-main.c
View File

@@ -269,7 +269,7 @@ static const struct pci_device_id ddb_id_table[] = {
DDB_DEVICE_ANY(0x0323),
DDB_DEVICE_ANY(0x0328),
DDB_DEVICE_ANY(0x0329),
{0}
{ }
};
MODULE_DEVICE_TABLE(pci, ddb_id_table);

10
drivers/media/pci/dm1105/dm1105.c
View File

@@ -1209,15 +1209,9 @@ static void dm1105_remove(struct pci_dev *pdev)
static const struct pci_device_id dm1105_id_table[] = {
{
.vendor = PCI_VENDOR_ID_TRIGEM,
.device = PCI_DEVICE_ID_DM1105,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_VDEVICE(TRIGEM, PCI_DEVICE_ID_DM1105),
}, {
.vendor = PCI_VENDOR_ID_AXESS,
.device = PCI_DEVICE_ID_DM05,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_VDEVICE(AXESS, PCI_DEVICE_ID_DM05),
}, {
/* empty */
},

4
drivers/media/pci/dt3155/dt3155.c
View File

@@ -577,8 +577,8 @@ static void dt3155_remove(struct pci_dev *pdev)
}
static const struct pci_device_id pci_ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, DT3155_DEVICE_ID) },
{ 0, /* zero marks the end */ },
{ PCI_VDEVICE(INTEL, DT3155_DEVICE_ID) },
{ /* zero marks the end */ },
};
MODULE_DEVICE_TABLE(pci, pci_ids);

2
drivers/media/pci/intel/ipu3/ipu3-cio2.c
View File

@@ -1961,7 +1961,7 @@ static const struct dev_pm_ops cio2_pm_ops = {
};
static const struct pci_device_id cio2_pci_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, CIO2_PCI_ID) },
{ PCI_VDEVICE(INTEL, CIO2_PCI_ID) },
{ }
};

8
drivers/media/pci/ivtv/ivtv-driver.c
View File

@@ -60,11 +60,9 @@ EXPORT_SYMBOL(ivtv_ext_init);
/* add your revision and whatnot here */
static const struct pci_device_id ivtv_pci_tbl[] = {
{PCI_VENDOR_ID_ICOMP, PCI_DEVICE_ID_IVTV15,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{PCI_VENDOR_ID_ICOMP, PCI_DEVICE_ID_IVTV16,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,}
{ PCI_VDEVICE(ICOMP, PCI_DEVICE_ID_IVTV15) },
{ PCI_VDEVICE(ICOMP, PCI_DEVICE_ID_IVTV16) },
{ }
};
MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);

8
drivers/media/pci/mantis/mantis_common.h
View File

@@ -58,11 +58,9 @@
#define TERRATEC 0x153b
#define MAKE_ENTRY(__subven, __subdev, __configptr, __rc) { \
.vendor = TWINHAN_TECHNOLOGIES, \
.device = MANTIS, \
.subvendor = (__subven), \
.subdevice = (__subdev), \
.driver_data = (unsigned long) \
PCI_DEVICE_SUB(TWINHAN_TECHNOLOGIES, MANTIS, \
(__subven), (__subdev)), \
.driver_data = (unsigned long) \
&(struct mantis_pci_drvdata){__configptr, __rc} \
}

6
drivers/media/pci/mgb4/mgb4_core.c
View File

@@ -694,9 +694,9 @@ static void mgb4_remove(struct pci_dev *pdev)
}
static const struct pci_device_id mgb4_pci_ids[] = {
{ PCI_DEVICE(DIGITEQ_VID, T100_DID), },
{ PCI_DEVICE(DIGITEQ_VID, T200_DID), },
{ 0, }
{ PCI_DEVICE(DIGITEQ_VID, T100_DID) },
{ PCI_DEVICE(DIGITEQ_VID, T200_DID) },
{ }
};
MODULE_DEVICE_TABLE(pci, mgb4_pci_ids);

2
drivers/media/pci/netup_unidvb/netup_unidvb_core.c
View File

@@ -1014,7 +1014,7 @@ static void netup_unidvb_finidev(struct pci_dev *pci_dev)
static const struct pci_device_id netup_unidvb_pci_tbl[] = {
{ PCI_DEVICE(0x1b55, 0x18f6) }, /* hw rev. 1.3 */
{ PCI_DEVICE(0x1b55, 0x18f7) }, /* hw rev. 1.4 */
{ 0, }
{ }
};
MODULE_DEVICE_TABLE(pci, netup_unidvb_pci_tbl);

5
drivers/media/pci/ngene/ngene-cards.c
View File

@@ -1155,8 +1155,7 @@ static const struct ngene_info ngene_info_terratec = {
/****************************************************************************/
#define NGENE_ID(_subvend, _subdev, _driverdata) { \
.vendor = NGENE_VID, .device = NGENE_PID, \
.subvendor = _subvend, .subdevice = _subdev, \
PCI_DEVICE_SUB(NGENE_VID, NGENE_PID, (_subvend), (_subdev)), \
.driver_data = (unsigned long) &_driverdata }
/****************************************************************************/
@@ -1173,7 +1172,7 @@ static const struct pci_device_id ngene_id_tbl[] = {
NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlex),
NGENE_ID(0x1461, 0x062e, ngene_info_m780),
NGENE_ID(0x153b, 0x1167, ngene_info_terratec),
{0}
{ }
};
MODULE_DEVICE_TABLE(pci, ngene_id_tbl);

5
drivers/media/pci/pluto2/pluto2.c
View File

@@ -762,10 +762,7 @@ static void pluto2_remove(struct pci_dev *pdev)
static const struct pci_device_id pluto2_id_table[] = {
{
.vendor = PCI_VENDOR_ID_SCM,
.device = PCI_DEVICE_ID_PLUTO2,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_VDEVICE(SCM, PCI_DEVICE_ID_PLUTO2),
}, {
/* empty */
},

1949
drivers/media/pci/saa7134/saa7134-cards.c
View File

File diff suppressed because it is too large Load Diff

22
drivers/media/pci/saa7146/hexium_gemini.c
View File

@@ -361,22 +361,14 @@ static struct saa7146_pci_extension_data hexium_gemini_dual_4bnc = {
static const struct pci_device_id pci_tbl[] = {
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x17c8,
.subdevice = 0x2401,
.driver_data = (unsigned long) &hexium_gemini_4bnc,
},
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x17c8, 0x2401),
.driver_data = (unsigned long)&hexium_gemini_4bnc,
},
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x17c8,
.subdevice = 0x2402,
.driver_data = (unsigned long) &hexium_gemini_dual_4bnc,
},
{
.vendor = 0,
}
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x17c8, 0x2402),
.driver_data = (unsigned long)&hexium_gemini_dual_4bnc,
},
{ }
};
MODULE_DEVICE_TABLE(pci, pci_tbl);

33
drivers/media/pci/saa7146/hexium_orion.c
View File

@@ -425,29 +425,16 @@ static struct saa7146_pci_extension_data hexium_orion_4bnc = {
static const struct pci_device_id pci_tbl[] = {
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x0000,
.subdevice = 0x0000,
.driver_data = (unsigned long) &hexium_hv_pci6,
},
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x17c8,
.subdevice = 0x0101,
.driver_data = (unsigned long) &hexium_orion_1svhs_3bnc,
},
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x17c8,
.subdevice = 0x2101,
.driver_data = (unsigned long) &hexium_orion_4bnc,
},
{
.vendor = 0,
}
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x0000, 0x0000),
.driver_data = (unsigned long)&hexium_hv_pci6,
}, {
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x17c8, 0x0101),
.driver_data = (unsigned long)&hexium_orion_1svhs_3bnc,
}, {
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x17c8, 0x2101),
.driver_data = (unsigned long)&hexium_orion_4bnc,
},
{ }
};
MODULE_DEVICE_TABLE(pci, pci_tbl);

10
drivers/media/pci/saa7146/mxb.c
View File

@@ -821,14 +821,10 @@ static struct saa7146_pci_extension_data mxb = {
static const struct pci_device_id pci_tbl[] = {
{
.vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7146,
.subvendor = 0x0000,
.subdevice = 0x0000,
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, 0x0000, 0x0000),
.driver_data = (unsigned long)&mxb,
}, {
.vendor = 0,
}
},
{ }
};
MODULE_DEVICE_TABLE(pci, pci_tbl);

5
drivers/media/pci/saa7164/saa7164-core.c
View File

@@ -1535,10 +1535,7 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
static const struct pci_device_id saa7164_pci_tbl[] = {
{
/* SAA7164 */
.vendor = 0x1131,
.device = 0x7164,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
PCI_DEVICE(0x1131, 0x7164),
}, {
/* --- end of list --- */
}

5
drivers/media/pci/smipcie/smipcie-main.c
View File

@@ -1097,8 +1097,7 @@ static const struct smi_cfg_info technotrend_s2_4200_cfg = {
/* PCI IDs */
#define SMI_ID(_subvend, _subdev, _driverdata) { \
.vendor = SMI_VID, .device = SMI_PID, \
.subvendor = _subvend, .subdevice = _subdev, \
PCI_DEVICE_SUB(SMI_VID, SMI_PID, (_subvend), (_subdev)), \
.driver_data = (unsigned long)&_driverdata }
static const struct pci_device_id smi_id_table[] = {
@@ -1106,7 +1105,7 @@ static const struct pci_device_id smi_id_table[] = {
SMI_ID(0x4254, 0x0552, dvbsky_s952_cfg),
SMI_ID(0x4254, 0x5580, dvbsky_t9580_cfg),
SMI_ID(0x13c2, 0x3016, technotrend_s2_4200_cfg),
{0}
{ }
};
MODULE_DEVICE_TABLE(pci, smi_id_table);

2
drivers/media/pci/solo6x10/solo6x10-core.c
View File

@@ -656,7 +656,7 @@ static const struct pci_device_id solo_id_table[] = {
.driver_data = SOLO_DEV_6110 },
{ PCI_DEVICE(PCI_VENDOR_ID_BLUECHERRY, PCI_DEVICE_ID_BC_6110_16),
.driver_data = SOLO_DEV_6110 },
{0,}
{ }
};
MODULE_DEVICE_TABLE(pci, solo_id_table);

4
drivers/media/pci/ttpci/budget-ci.c
View File

@@ -1537,9 +1537,7 @@ static const struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(ttc1501, 0x13c2, 0x101a),
MAKE_EXTENSION_PCI(tt3200, 0x13c2, 0x1019),
MAKE_EXTENSION_PCI(ttbs1500b, 0x13c2, 0x101b),
{
.vendor = 0,
}
{ }
};
MODULE_DEVICE_TABLE(pci, pci_tbl);

4
drivers/media/pci/ttpci/budget.c
View File

@@ -858,9 +858,7 @@ static const struct pci_device_id pci_tbl[] = {
MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
MAKE_EXTENSION_PCI(omicom, 0x14c4, 0x1020),
MAKE_EXTENSION_PCI(sylt, 0x1131, 0x4f52),
{
.vendor = 0,
}
{ }
};
MODULE_DEVICE_TABLE(pci, pci_tbl);

4
drivers/media/pci/tw5864/tw5864-core.c
View File

@@ -72,8 +72,8 @@ MODULE_PARM_DESC(video_nr, "video devices numbers array");
* added under vendor 0x1797 (Techwell Inc.) as subsystem IDs.
*/
static const struct pci_device_id tw5864_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_5864)},
{0,}
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_5864) },
{ }
};
void tw5864_irqmask_apply(struct tw5864_dev *dev)

16
drivers/media/pci/tw68/tw68-core.c
View File

@@ -62,14 +62,14 @@ static atomic_t tw68_instance = ATOMIC_INIT(0);
* added under vendor 0x1797 (Techwell Inc.) as subsystem IDs.
*/
static const struct pci_device_id tw68_pci_tbl[] = {
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6800)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6801)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6804)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_1)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_2)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_3)},
{PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_4)},
{0,}
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6800) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6801) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6804) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_1) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_2) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_3) },
{ PCI_VDEVICE(TECHWELL, PCI_DEVICE_ID_TECHWELL_6816_4) },
{ }
};
/* ------------------------------------------------------------------ */

23
drivers/media/pci/tw686x/tw686x-core.c
View File

@@ -416,25 +416,24 @@ static void tw686x_remove(struct pci_dev *pci_dev)
/* driver_data is number of A/V channels */
static const struct pci_device_id tw686x_pci_tbl[] = {
{
PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, 0x6864),
.driver_data = 4
},
{
PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, 0x6865), /* not tested */
.driver_data = 4 | TYPE_SECOND_GEN
PCI_VDEVICE(TECHWELL, 0x6864),
.driver_data = 4,
}, {
PCI_VDEVICE(TECHWELL, 0x6865), /* not tested */
.driver_data = 4 | TYPE_SECOND_GEN,
},
/*
* TW6868 supports 8 A/V channels with an external TW2865 chip;
* not supported by the driver.
*/
{
PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, 0x6868), /* not tested */
.driver_data = 4
PCI_VDEVICE(TECHWELL, 0x6868), /* not tested */
.driver_data = 4,
}, {
PCI_VDEVICE(TECHWELL, 0x6869),
.driver_data = 8 | TYPE_SECOND_GEN
},
{
PCI_DEVICE(PCI_VENDOR_ID_TECHWELL, 0x6869),
.driver_data = 8 | TYPE_SECOND_GEN},
{}
{ }
};
MODULE_DEVICE_TABLE(pci, tw686x_pci_tbl);

7
drivers/media/pci/zoran/zoran_card.c
View File

@@ -75,8 +75,9 @@ MODULE_LICENSE("GPL");
MODULE_VERSION(ZORAN_VERSION);
#define ZR_DEVICE(subven, subdev, data) { \
.vendor = PCI_VENDOR_ID_ZORAN, .device = PCI_DEVICE_ID_ZORAN_36057, \
.subvendor = (subven), .subdevice = (subdev), .driver_data = (data) }
PCI_DEVICE_SUB(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36057, \
(subven), (subdev)), \
.driver_data = (data) }
static const struct pci_device_id zr36067_pci_tbl[] = {
ZR_DEVICE(PCI_VENDOR_ID_MIRO, PCI_DEVICE_ID_MIRO_DC10PLUS, DC10_PLUS),
@@ -84,7 +85,7 @@ static const struct pci_device_id zr36067_pci_tbl[] = {
ZR_DEVICE(PCI_VENDOR_ID_ELECTRONICDESIGNGMBH, PCI_DEVICE_ID_LML_33R10, LML33R10),
ZR_DEVICE(PCI_VENDOR_ID_IOMEGA, PCI_DEVICE_ID_IOMEGA_BUZ, BUZ),
ZR_DEVICE(PCI_ANY_ID, PCI_ANY_ID, NUM_CARDS),
{0}
{ }
};
MODULE_DEVICE_TABLE(pci, zr36067_pci_tbl);

11
include/media/drv-intf/saa7146.h
View File

@@ -77,13 +77,10 @@ struct saa7146_pci_extension_data {
void *ext_priv; /* most likely a name string */
};
#define MAKE_EXTENSION_PCI(x_var, x_vendor, x_device) \
{ \
.vendor = PCI_VENDOR_ID_PHILIPS, \
.device = PCI_DEVICE_ID_PHILIPS_SAA7146, \
.subvendor = x_vendor, \
.subdevice = x_device, \
.driver_data = (unsigned long)& x_var, \
#define MAKE_EXTENSION_PCI(x_var, x_vendor, x_device) \
{ \
PCI_VDEVICE_SUB(PHILIPS, PCI_DEVICE_ID_PHILIPS_SAA7146, (x_vendor), (x_device)),\
.driver_data = (unsigned long)&(x_var), \
}
struct saa7146_extension