The PCI_VDEVICE macro can simplify declarations.
Converted source code to use it via the script below:
#! /bin/bash
for line in \
$(grep -ioP "PCI_VENDOR_ID_\w+\s+0x[a-f0-9]{4,4}" include/linux/pci_ids.h | \
sed -r -e "s/PCI_VENDOR_ID_(\w+)\s+(0x[a-fA-F0-9]{1,4})/\2:\1/g" | \
grep -vi "0x1102") ; do
constant=$(echo $line | cut -f1 -d":")
vendor=$(echo $line | cut -f2 -d":")
echo "$constant -> $vendor"
for file in $(grep -rP --include=*.[ch] -li -w \
$constant drivers sound) ; do
perl -i -e \
"local $/; while(<>) { s/\b$constant\s*,\s*(\w+)\s*,\s*PCI_ANY_ID\s*,\s*PCI_ANY_ID\s*,\s*0\s*,\s*0\s*,\s*/PCI_VDEVICE\($vendor, \1\), /gi; print; }" $file
done
for file in $(grep -rP --include=*.[ch] -li -w \
PCI_VENDOR_ID_$vendor drivers sound) ; do
perl -i -e \
"local $/; while(<>) { s/\bPCI_VENDOR_ID_$vendor\s*,\s*(\w+)\s*,\s*PCI_ANY_ID\s*,\s*PCI_ANY_ID\s*,\s*0\s*,\s*0\s*,\s*/PCI_VDEVICE\($vendor, \1\), /g; print; }" $file
done
done
---------
Joe Perches (19):
drivers/ata: Use PCI_VDEVICE
drivers/atm: Use PCI_VDEVICE
drivers/block: Use PCI_VDEVICE
drivers/char/hw_random: Use PCI_VDEVICE
drivers/isdn: Use PCI_VDEVICE
drivers/media: Use PCI_VDEVICE
drivers/memstick: Use PCI_VDEVICE
drivers/misc: Use PCI_VDEVICE
drivers/mmc: Use PCI_VDEVICE
drivers/net/wan: Use PCI_VDEVICE
drivers/net/wireless: Use PCI_VDEVICE
drivers/net: Use PCI_VDEVICE
drivers/parport: Use PCI_VDEVICE
drivers/scsi: Use PCI_VDEVICE
drivers/serial: Use PCI_VDEVICE
drivers/staging: Use PCI_VDEVICE
drivers/telephony: Use PCI_VDEVICE
drivers/video: Use PCI_VDEVICE
sound: Use PCI_VDEVICE
drivers/ata/ata_piix.c | 98 ++--
drivers/ata/pata_scc.c | 3 +-
drivers/atm/ambassador.c | 6 +-
drivers/atm/eni.c | 6 +-
drivers/atm/firestream.c | 6 +-
drivers/atm/fore200e.c | 3 +-
drivers/atm/he.c | 3 +-
drivers/atm/horizon.c | 3 +-
drivers/atm/idt77252.c | 3 +-
drivers/atm/nicstar.c | 3 +-
drivers/atm/solos-pci.c | 2 +-
drivers/atm/zatm.c | 6 +-
drivers/block/sx8.c | 4 +-
drivers/char/hw_random/amd-rng.c | 4 +-
drivers/char/hw_random/geode-rng.c | 3 +-
drivers/isdn/hardware/eicon/divasmain.c | 34 +-
drivers/isdn/hardware/mISDN/hfcmulti.c | 9 +-
drivers/isdn/hardware/mISDN/hfcpci.c | 69 +--
drivers/media/video/bt8xx/bttv-driver.c | 12 +-
drivers/media/video/meye.c | 3 +-
drivers/memstick/host/jmb38x_ms.c | 3 +-
drivers/misc/tifm_7xx1.c | 9 +-
drivers/mmc/host/via-sdmmc.c | 3 +-
drivers/net/3c59x.c | 90 ++--
drivers/net/8139too.c | 18 +-
drivers/net/amd8111e.c | 3 +-
drivers/net/arcnet/com20020-pci.c | 6 +-
drivers/net/bnx2.c | 24 +-
drivers/net/bnx2x_main.c | 9 +-
drivers/net/cassini.c | 6 +-
drivers/net/cxgb3/cxgb3_main.c | 2 +-
drivers/net/irda/via-ircc.c | 10 +-
drivers/net/natsemi.c | 2 +-
drivers/net/ne2k-pci.c | 12 +-
drivers/net/pci-skeleton.c | 4 +-
drivers/net/sis900.c | 6 +-
drivers/net/spider_net.c | 3 +-
drivers/net/starfire.c | 2 +-
drivers/net/sundance.c | 6 +-
drivers/net/sungem.c | 24 +-
drivers/net/tehuti.c | 6 +-
drivers/net/tlan.c | 39 +-
drivers/net/tokenring/tmspci.c | 8 +-
drivers/net/tulip/de2104x.c | 6 +-
drivers/net/tulip/de4x5.c | 12 +-
drivers/net/tulip/tulip_core.c | 28 +-
drivers/net/tulip/uli526x.c | 4 +-
drivers/net/tulip/winbond-840.c | 4 +-
drivers/net/typhoon.c | 18 +-
drivers/net/wan/farsync.c | 21 +-
drivers/net/wan/pc300_drv.c | 12 +-
drivers/net/wan/pc300too.c | 12 +-
drivers/net/wan/wanxl.c | 9 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 10 +-
drivers/net/wireless/prism54/islpci_hotplug.c | 4 +-
drivers/net/yellowfin.c | 4 +-
drivers/parport/parport_pc.c | 98 ++---
drivers/parport/parport_serial.c | 93 ++---
drivers/scsi/3w-9xxx.c | 12 +-
drivers/scsi/3w-xxxx.c | 6 +-
drivers/scsi/BusLogic.c | 9 +-
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/aacraid/linit.c | 6 +-
drivers/scsi/dmx3191d.c | 3 +-
drivers/scsi/fdomain.c | 3 +-
drivers/scsi/initio.c | 20 +-
drivers/scsi/megaraid.c | 9 +-
drivers/scsi/qla1280.c | 18 +-
drivers/scsi/stex.c | 18 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 45 +--
drivers/scsi/tmscsim.c | 3 +-
drivers/serial/8250_pci.c | 526 +++++---------------
.../staging/comedi/drivers/addi-data/addi_common.c | 54 +-
drivers/staging/epl/Edrv8139.c | 2 +-
drivers/staging/vt6655/device_main.c | 2 +-
drivers/telephony/ixj.c | 3 +-
drivers/video/aty/aty128fb.c | 141 ++----
drivers/video/aty/radeon_base.c | 2 +-
drivers/video/cirrusfb.c | 2 +-
drivers/video/cyber2000fb.c | 9 +-
drivers/video/i810/i810_main.c | 18 +-
drivers/video/igafb.c | 3 +-
drivers/video/imsttfb.c | 6 +-
drivers/video/matrox/matroxfb_base.c | 33 +-
drivers/video/neofb.c | 27 +-
drivers/video/pm2fb.c | 9 +-
drivers/video/pm3fb.c | 3 +-
drivers/video/pvr2fb.c | 3 +-
drivers/video/riva/fbdev.c | 126 ++----
drivers/video/savage/savagefb_driver.c | 69 +--
drivers/video/sis/sis_main.h | 20 +-
drivers/video/tridentfb.c | 42 +-
sound/oss/kahlua.c | 2 +-
sound/pci/atiixp.c | 8 +-
sound/pci/atiixp_modem.c | 4 +-
sound/pci/au88x0/au8810.c | 3 +-
sound/pci/au88x0/au8820.c | 3 +-
sound/pci/au88x0/au8830.c | 3 +-
sound/pci/cmipci.c | 10 +-
sound/pci/cs4281.c | 2 +-
sound/pci/cs46xx/cs46xx.c | 6 +-
sound/pci/ens1370.c | 6 +-
sound/pci/es1938.c | 2 +-
sound/pci/ice1712/ice1712.c | 2 +-
sound/pci/ice1712/ice1724.c | 2 +-
sound/pci/intel8x0.c | 46 +-
sound/pci/intel8x0m.c | 34 +-
sound/pci/mixart/mixart.c | 2 +-
sound/pci/nm256/nm256.c | 6 +-
sound/pci/rme32.c | 9 +-
sound/pci/rme96.c | 12 +-
sound/pci/sonicvibes.c | 2 +-
sound/pci/via82xx.c | 4 +-
sound/pci/via82xx_modem.c | 2 +-
sound/pci/ymfpci/ymfpci.c | 12 +-
115 files changed, 838 insertions(+), 1508 deletions(-)
Signed-off-by: Joe Perches <[email protected]>
---
drivers/atm/ambassador.c | 6 ++----
drivers/atm/eni.c | 6 ++----
drivers/atm/firestream.c | 6 ++----
drivers/atm/fore200e.c | 3 +--
drivers/atm/he.c | 3 +--
drivers/atm/horizon.c | 3 +--
drivers/atm/idt77252.c | 3 +--
drivers/atm/nicstar.c | 3 +--
drivers/atm/solos-pci.c | 2 +-
drivers/atm/zatm.c | 6 ++----
10 files changed, 14 insertions(+), 27 deletions(-)
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 703364b..cae8b04 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -2377,10 +2377,8 @@ MODULE_PARM_DESC(pci_lat, "PCI latency in bus cycles");
/********** module entry **********/
static struct pci_device_id amb_pci_tbl[] = {
- { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0 },
- { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0 },
+ { PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR), 0 },
+ { PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_AMBASSADOR_BAD), 0 },
{ 0, }
};
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 5503bfc..b1d7acd 100644
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -2268,10 +2268,8 @@ out0:
static struct pci_device_id eni_pci_tbl[] = {
- { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_FPGA, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0 /* FPGA */ },
- { PCI_VENDOR_ID_EF, PCI_DEVICE_ID_EF_ATM_ASIC, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 1 /* ASIC */ },
+ { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_FPGA), 0 /* FPGA */ },
+ { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_ASIC), 1 /* ASIC */ },
{ 0, }
};
MODULE_DEVICE_TABLE(pci,eni_pci_tbl);
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index b119640..8cb3088 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -2026,10 +2026,8 @@ static void __devexit firestream_remove_one (struct pci_dev *pdev)
}
static struct pci_device_id firestream_pci_tbl[] = {
- { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS50},
- { PCI_VENDOR_ID_FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FS_IS155},
+ { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS50), FS_IS50},
+ { PCI_VDEVICE(FUJITSU_ME, PCI_DEVICE_ID_FUJITSU_FS155), FS_IS155},
{ 0, }
};
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index 10f000d..1241b08 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -2770,8 +2770,7 @@ static void __devexit fore200e_pca_remove_one(struct pci_dev *pci_dev)
static struct pci_device_id fore200e_pca_tbl[] = {
- { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_PCA200E, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, (unsigned long) &fore200e_bus[0] },
+ { PCI_VDEVICE(FORE, PCI_DEVICE_ID_FORE_PCA200E), (unsigned long) &fore200e_bus[0] },
{ 0, }
};
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 2de6406..a536a53 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -2921,8 +2921,7 @@ module_param(sdh, bool, 0);
MODULE_PARM_DESC(sdh, "use SDH framing (default 0)");
static struct pci_device_id he_pci_tbl[] = {
- { PCI_VENDOR_ID_FORE, PCI_DEVICE_ID_FORE_HE, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0 },
+ { PCI_VDEVICE(FORE, PCI_DEVICE_ID_FORE_HE), 0 },
{ 0, }
};
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 6b969f8..cec9a66 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2896,8 +2896,7 @@ MODULE_PARM_DESC(max_rx_size, "maximum size of RX AAL5 frames");
MODULE_PARM_DESC(pci_lat, "PCI latency in bus cycles");
static struct pci_device_id hrz_pci_tbl[] = {
- { PCI_VENDOR_ID_MADGE, PCI_DEVICE_ID_MADGE_HORIZON, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0 },
+ { PCI_VDEVICE(MADGE, PCI_DEVICE_ID_MADGE_HORIZON), 0 },
{ 0, }
};
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index e33ae00..351b9b0 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -3781,8 +3781,7 @@ err_out_disable_pdev:
static struct pci_device_id idt77252_pci_tbl[] =
{
- { PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77252,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77252), 0 },
{ 0, }
};
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index 3da804b..8ddacf8 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -277,8 +277,7 @@ static void __devexit nicstar_remove_one(struct pci_dev *pcidev)
static struct pci_device_id nicstar_pci_tbl[] __devinitdata =
{
- {PCI_VENDOR_ID_IDT, PCI_DEVICE_ID_IDT_IDT77201,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(IDT, PCI_DEVICE_ID_IDT_IDT77201), 0},
{0,} /* terminate list */
};
MODULE_DEVICE_TABLE(pci, nicstar_pci_tbl);
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 9359613..376c120 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1265,7 +1265,7 @@ static void fpga_remove(struct pci_dev *dev)
}
static struct pci_device_id fpga_pci_tbl[] __devinitdata = {
- { 0x10ee, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(XILINX, 0x0300), 0 },
{ 0, }
};
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
index 752b1ba..d33d6b6 100644
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
@@ -1636,10 +1636,8 @@ out_free:
MODULE_LICENSE("GPL");
static struct pci_device_id zatm_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1221,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, ZATM_COPPER },
- { PCI_VENDOR_ID_ZEITNET, PCI_DEVICE_ID_ZEITNET_1225,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1221), ZATM_COPPER },
+ { PCI_VDEVICE(ZEITNET, PCI_DEVICE_ID_ZEITNET_1225), 0 },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, zatm_pci_tbl);
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/block/sx8.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index da403b6..55fab42 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -410,8 +410,8 @@ static void carm_remove_one (struct pci_dev *pdev);
static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);
static struct pci_device_id carm_pci_tbl[] = {
- { PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
- { PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+ { PCI_VDEVICE(PROMISE, 0x8000), },
+ { PCI_VDEVICE(PROMISE, 0x8002), },
{ } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, carm_pci_tbl);
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/char/hw_random/amd-rng.c | 4 ++--
drivers/char/hw_random/geode-rng.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
index cd0ba51..0d8c578 100644
--- a/drivers/char/hw_random/amd-rng.c
+++ b/drivers/char/hw_random/amd-rng.c
@@ -44,8 +44,8 @@
* want to register another driver on the same PCI id.
*/
static const struct pci_device_id pci_tbl[] = {
- { 0x1022, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
- { 0x1022, 0x746b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+ { PCI_VDEVICE(AMD, 0x7443), 0, },
+ { PCI_VDEVICE(AMD, 0x746b), 0, },
{ 0, }, /* terminate list */
};
MODULE_DEVICE_TABLE(pci, pci_tbl);
diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
index 64d513f..4c4d4e1 100644
--- a/drivers/char/hw_random/geode-rng.c
+++ b/drivers/char/hw_random/geode-rng.c
@@ -46,8 +46,7 @@
* want to register another driver on the same PCI id.
*/
static const struct pci_device_id pci_tbl[] = {
- { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_LX_AES), 0, },
{ 0, }, /* terminate list */
};
MODULE_DEVICE_TABLE(pci, pci_tbl);
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/isdn/hardware/eicon/divasmain.c | 34 +++++----------
drivers/isdn/hardware/mISDN/hfcmulti.c | 9 +---
drivers/isdn/hardware/mISDN/hfcpci.c | 69 ++++++++++--------------------
3 files changed, 37 insertions(+), 75 deletions(-)
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index fbbcb27..44804be 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -114,39 +114,27 @@ typedef struct _diva_os_thread_dpc {
*/
static struct pci_device_id divas_pci_tbl[] = {
/* Diva Server BRI-2M PCI 0xE010 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_MAESTRA_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA), CARDTYPE_MAESTRA_PCI},
/* Diva Server 4BRI-8M PCI 0xE012 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ), CARDTYPE_DIVASRV_Q_8M_PCI},
/* Diva Server 4BRI-8M 2.0 PCI 0xE013 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U), CARDTYPE_DIVASRV_Q_8M_V2_PCI},
/* Diva Server PRI-30M PCI 0xE014 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP), CARDTYPE_DIVASRV_P_30M_PCI},
/* Diva Server PRI 2.0 adapter 0xE015 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2), CARDTYPE_DIVASRV_P_30M_V2_PCI},
/* Diva Server Voice 4BRI-8M PCI 0xE016 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP), CARDTYPE_DIVASRV_VOICE_Q_8M_PCI},
/* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP), CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI},
/* Diva Server BRI-2M 2.0 PCI 0xE018 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2), CARDTYPE_DIVASRV_B_2M_V2_PCI},
/* Diva Server Voice PRI 2.0 PCI 0xE019 */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP), CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI},
/* Diva Server 2FX 0xE01A */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_2F,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2F_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_2F), CARDTYPE_DIVASRV_B_2F_PCI},
/* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */
- {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI},
+ {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP), CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI},
{0,} /* 0 terminated list. */
};
MODULE_DEVICE_TABLE(pci, divas_pci_tbl);
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index e1dab30..dcfab65 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -5361,12 +5361,9 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_VENDOR_ID_CCD,
PCI_SUBDEVICE_ID_CCD_JHSE1, 0, 0, H(25)}, /* Junghanns E1 */
- { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC4S, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0},
- { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0},
- { PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFCE1, PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0},
+ { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC4S), 0},
+ { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFC8S), 0},
+ { PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_HFCE1), 0},
{0, }
};
#undef H
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 228ffbe..63e685c 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2201,52 +2201,29 @@ static const struct _hfc_map hfc_map[] =
static struct pci_device_id hfc_ids[] =
{
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},
- {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},
- {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},
- {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},
- {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},
- {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},
- {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},
- {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},
- {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},
- {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},
- {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},
- {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},
- {PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0), (unsigned long) &hfc_map[0]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000), (unsigned long) &hfc_map[1]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006), (unsigned long) &hfc_map[2]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007), (unsigned long) &hfc_map[3]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008), (unsigned long) &hfc_map[4]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009), (unsigned long) &hfc_map[5]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A), (unsigned long) &hfc_map[6]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B), (unsigned long) &hfc_map[7]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C), (unsigned long) &hfc_map[8]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100), (unsigned long) &hfc_map[9]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700), (unsigned long) &hfc_map[10]},
+ {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701), (unsigned long) &hfc_map[11]},
+ {PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1), (unsigned long) &hfc_map[12]},
+ {PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675), (unsigned long) &hfc_map[13]},
+ {PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT), (unsigned long) &hfc_map[14]},
+ {PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T), (unsigned long) &hfc_map[15]},
+ {PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575), (unsigned long) &hfc_map[16]},
+ {PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0), (unsigned long) &hfc_map[17]},
+ {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E), (unsigned long) &hfc_map[18]},
+ {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E), (unsigned long) &hfc_map[19]},
+ {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A), (unsigned long) &hfc_map[20]},
+ {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A), (unsigned long) &hfc_map[21]},
+ {PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2), (unsigned long) &hfc_map[22]},
{},
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/misc/tifm_7xx1.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index a6ef182..de74445 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -415,12 +415,9 @@ static void tifm_7xx1_remove(struct pci_dev *dev)
}
static struct pci_device_id tifm_7xx1_pci_tbl [] = {
- { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX21_XX11_FM, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 }, /* xx21 - the one I have */
- { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX12_FM, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_XX20_FM, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_XX21_XX11_FM), 0 }, /* xx21 - the one I have */
+ { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_XX12_FM), 0 },
+ { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_XX20_FM), 0 },
{ }
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/memstick/host/jmb38x_ms.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index f4a162a..cdd89be 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -982,8 +982,7 @@ static void jmb38x_ms_remove(struct pci_dev *dev)
}
static struct pci_device_id jmb38x_ms_id_tbl [] = {
- { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_MS, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(JMICRON, PCI_DEVICE_ID_JMICRON_JMB38X_MS), 0 },
{ }
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/media/video/bt8xx/bttv-driver.c | 12 ++++--------
drivers/media/video/meye.c | 3 +--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5eb1464..d8d3e1d 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4591,14 +4591,10 @@ static int bttv_resume(struct pci_dev *pci_dev)
#endif
static struct pci_device_id bttv_pci_tbl[] = {
- {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT848,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT849,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT878,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BT879,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {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},
{0,}
};
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 1d66855..d0765be 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1915,8 +1915,7 @@ static void __devexit meye_remove(struct pci_dev *pcidev)
}
static struct pci_device_id meye_pci_tbl[] = {
- { PCI_VENDOR_ID_KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(KAWASAKI, PCI_DEVICE_ID_MCHIP_KL5A72002), 0 },
{ }
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wan/farsync.c | 21 +++++++--------------
drivers/net/wan/pc300_drv.c | 12 ++++++------
drivers/net/wan/pc300too.c | 12 ++++--------
drivers/net/wan/wanxl.c | 9 +++------
4 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index 25c9ef6..8e9272a 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -528,26 +528,19 @@ static int fst_debug_mask = { FST_DEBUG };
* PCI ID lookup table
*/
static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2P), FST_TYPE_T2P},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4P, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_T4P},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4P), FST_TYPE_T4P},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T1U, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_T1U},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T1U), FST_TYPE_T1U},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2U, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_T2U},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2U), FST_TYPE_T2U},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4U, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_T4U},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4U), FST_TYPE_T4U},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1), FST_TYPE_TE1},
- {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1C, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
+ {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1C), FST_TYPE_TE1},
{0,} /* End */
};
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index 79dabc5..d035e8b 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -253,17 +253,17 @@ static char rcsid[] =
static struct pci_device_id cpc_pci_dev_id[] __devinitdata = {
/* PC300/RSV or PC300/X21, 2 chan */
- {0x120e, 0x300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x300},
+ {PCI_VDEVICE(CYCLADES, 0x300), 0x300},
/* PC300/RSV or PC300/X21, 1 chan */
- {0x120e, 0x301, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x301},
+ {PCI_VDEVICE(CYCLADES, 0x301), 0x301},
/* PC300/TE, 2 chan */
- {0x120e, 0x310, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x310},
+ {PCI_VDEVICE(CYCLADES, 0x310), 0x310},
/* PC300/TE, 1 chan */
- {0x120e, 0x311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x311},
+ {PCI_VDEVICE(CYCLADES, 0x311), 0x311},
/* PC300/TE-M, 2 chan */
- {0x120e, 0x320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x320},
+ {PCI_VDEVICE(CYCLADES, 0x320), 0x320},
/* PC300/TE-M, 1 chan */
- {0x120e, 0x321, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0x321},
+ {PCI_VDEVICE(CYCLADES, 0x321), 0x321},
/* End of table */
{0,},
};
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index 60ece54..c57f168 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -482,14 +482,10 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
static struct pci_device_id pc300_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_2, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_1, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_TE_2, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_1), 0 },
+ { PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_RX_2), 0 },
+ { PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_1), 0 },
+ { PCI_VDEVICE(CYCLADES, PCI_DEVICE_ID_PC300_TE_2), 0 },
{ 0, }
};
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index e4ad7b6..3bde117 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -815,12 +815,9 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
}
static struct pci_device_id wanxl_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL100, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL200, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_SBE, PCI_DEVICE_ID_SBE_WANXL400, PCI_ANY_ID,
- PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL100), 0 },
+ { PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL200), 0 },
+ { PCI_VDEVICE(SBE, PCI_DEVICE_ID_SBE_WANXL400), 0 },
{ 0, }
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/wireless/ipw2x00/ipw2200.c | 10 +++++-----
drivers/net/wireless/prism54/islpci_hotplug.c | 4 +---
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 44c29b3..d726b3c 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -11436,11 +11436,11 @@ static struct pci_device_id card_ids[] = {
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
{PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
- {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
- {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
- {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
+ {PCI_VDEVICE(INTEL, 0x104f), 0},
+ {PCI_VDEVICE(INTEL, 0x4220), 0}, /* BG */
+ {PCI_VDEVICE(INTEL, 0x4221), 0}, /* BG */
+ {PCI_VDEVICE(INTEL, 0x4223), 0}, /* ABG */
+ {PCI_VDEVICE(INTEL, 0x4224), 0}, /* ABG */
/* required last entry */
{0,}
diff --git a/drivers/net/wireless/prism54/islpci_hotplug.c b/drivers/net/wireless/prism54/islpci_hotplug.c
index 3087672..83d3662 100644
--- a/drivers/net/wireless/prism54/islpci_hotplug.c
+++ b/drivers/net/wireless/prism54/islpci_hotplug.c
@@ -49,9 +49,7 @@ static const struct pci_device_id prism54_id_tbl[] = {
/* 3COM 3CRWE154G72 Wireless LAN adapter */
{
- 0x10b7, 0x6001,
- PCI_ANY_ID, PCI_ANY_ID,
- 0, 0, 0
+ PCI_VDEVICE(3COM, 0x6001), 0
},
/* Intersil PRISM Indigo Wireless LAN adapter */
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/mmc/host/via-sdmmc.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c
index 632858a..64cc105 100644
--- a/drivers/mmc/host/via-sdmmc.c
+++ b/drivers/mmc/host/via-sdmmc.c
@@ -322,8 +322,7 @@ struct via_crdr_mmc_host {
#define VIA_CRDR_QUIRK_300MS_PWRDELAY 0x0001
static struct pci_device_id via_ids[] = {
- {PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_9530,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
+ {PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_9530), 0,},
{0,}
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/parport/parport_pc.c | 98 +++++++++++++-------------------------
drivers/parport/parport_serial.c | 93 ++++++++++++------------------------
2 files changed, 65 insertions(+), 126 deletions(-)
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 1032d5f..b62796d 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -2993,28 +2993,19 @@ static struct parport_pc_pci {
static const struct pci_device_id parport_pc_pci_tbl[] = {
/* Super-IO onboard chips */
- { 0x1106, 0x0686, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_via_686a },
- { 0x1106, 0x8231, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_via_8231 },
- { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8872,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, sio_ite_8872 },
+ { PCI_VDEVICE(VIA, 0x0686), sio_via_686a },
+ { PCI_VDEVICE(VIA, 0x8231), sio_via_8231 },
+ { PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8872), sio_ite_8872 },
/* PCI cards */
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_10x,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_10x,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1P_20x,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P_20x,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p_20x },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PARALLEL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, lava_parallel },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, lava_parallel_dual_a },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, lava_parallel_dual_b },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_BOCA_IOPPAR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, boca_ioppar },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1P_10x), siig_1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2P_10x), siig_2p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1P_20x), siig_1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2P_20x), siig_2p_20x },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_PARALLEL), lava_parallel },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_A), lava_parallel_dual_a },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_DUAL_PAR_B), lava_parallel_dual_b },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_BOCA_IOPPAR), boca_ioppar },
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
PCI_SUBVENDOR_ID_EXSYS, PCI_SUBDEVICE_ID_EXSYS_4014, 0, 0, plx_9050 },
/* PCI_VENDOR_ID_TIMEDIA/SUNIX has many differing cards ...*/
@@ -3041,57 +3032,36 @@ static const struct pci_device_id parport_pc_pci_tbl[] = {
{ 0x1409, 0x7268, 0x1409, 0x0103, 0, 0, timedia_4008a },
{ 0x1409, 0x7268, 0x1409, 0x0104, 0, 0, timedia_4018 },
{ 0x1409, 0x7268, 0x1409, 0x9018, 0, 0, timedia_9018a },
- { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_2P_EPP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_2p_epp },
- { PCI_VENDOR_ID_SYBA, PCI_DEVICE_ID_SYBA_1P_ECP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, syba_1p_ecp },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_010L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_010l },
+ { PCI_VDEVICE(SYBA, PCI_DEVICE_ID_SYBA_2P_EPP), syba_2p_epp },
+ { PCI_VDEVICE(SYBA, PCI_DEVICE_ID_SYBA_1P_ECP), syba_1p_ecp },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_010L), titan_010l },
{ 0x9710, 0x9805, 0x1000, 0x0010, 0, 0, titan_1284p1 },
{ 0x9710, 0x9815, 0x1000, 0x0020, 0, 0, titan_1284p2 },
/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
/* AFAVLAB_TK9902 */
- { 0x14db, 0x2120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1p},
- { 0x14db, 0x2121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2p},
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_952 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_954 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_840 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840_G,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0_G,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_G,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_U,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, oxsemi_pcie_pport },
- { PCI_VENDOR_ID_AKS, PCI_DEVICE_ID_AKS_ALADDINCARD,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, aks_0100 },
+ { PCI_VDEVICE(AFAVLAB, 0x2120), avlab_1p},
+ { PCI_VDEVICE(AFAVLAB, 0x2121), avlab_2p},
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952PP), oxsemi_952 },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954PP), oxsemi_954 },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_12PCI840), oxsemi_840 },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe840_G), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_0_G), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_G), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_U), oxsemi_pcie_pport },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_PCIe952_1_GU), oxsemi_pcie_pport },
+ { PCI_VDEVICE(AKS, PCI_DEVICE_ID_AKS_ALADDINCARD), aks_0100 },
{ 0x14f2, 0x0121, PCI_ANY_ID, PCI_ANY_ID, 0, 0, mobility_pp },
/* NetMos communication controllers */
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9705,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9705 },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9715,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9715 },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9755,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9755 },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9805,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9805 },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9815,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9815 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9705), netmos_9705 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9715), netmos_9715 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9755), netmos_9755 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9805), netmos_9805 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9815), netmos_9815 },
/* Quatech SPPXP-100 Parallel port PCI ExpressCard */
- { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, quatech_sppxp100 },
+ { PCI_VDEVICE(QUATECH, PCI_DEVICE_ID_QUATECH_SPPXP_100), quatech_sppxp100 },
{ 0, } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, parport_pc_pci_tbl);
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index c3bb84a..06d42ad 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -108,73 +108,42 @@ static struct parport_pc_pci cards[] __devinitdata = {
static struct pci_device_id parport_serial_pci_tbl[] = {
/* PCI cards */
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_110L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_110l },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_210L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, titan_210l },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9735,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9745,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9845,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9xx5_combo },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_110L), titan_110l },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_210L), titan_210l },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9735), netmos_9xx5_combo },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9745), netmos_9xx5_combo },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9835), netmos_9xx5_combo },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9845), netmos_9xx5_combo },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
0x1000, 0x0020, 0, 0, netmos_9855_2p },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
0x1000, 0x0022, 0, 0, netmos_9855_2p },
- { PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9855,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, netmos_9855 },
+ { PCI_VDEVICE(NETMOS, PCI_DEVICE_ID_NETMOS_9855), netmos_9855 },
/* PCI_VENDOR_ID_AVLAB/Intek21 has another bunch of cards ...*/
- { PCI_VENDOR_ID_AFAVLAB, 0x2110,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2111,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2112,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s1p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2140,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2141,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2142,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_1s2p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2160,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2161,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
- { PCI_VENDOR_ID_AFAVLAB, 0x2162,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, avlab_2s1p },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_10x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2p1s_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_1s1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, siig_2s1p_20x },
+ { PCI_VDEVICE(AFAVLAB, 0x2110), avlab_1s1p },
+ { PCI_VDEVICE(AFAVLAB, 0x2111), avlab_1s1p },
+ { PCI_VDEVICE(AFAVLAB, 0x2112), avlab_1s1p },
+ { PCI_VDEVICE(AFAVLAB, 0x2140), avlab_1s2p },
+ { PCI_VDEVICE(AFAVLAB, 0x2141), avlab_1s2p },
+ { PCI_VDEVICE(AFAVLAB, 0x2142), avlab_1s2p },
+ { PCI_VDEVICE(AFAVLAB, 0x2160), avlab_2s1p },
+ { PCI_VDEVICE(AFAVLAB, 0x2161), avlab_2s1p },
+ { PCI_VDEVICE(AFAVLAB, 0x2162), avlab_2s1p },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_550), siig_1s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_650), siig_1s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_10x_850), siig_1s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_550), siig_2s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_650), siig_2s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_10x_850), siig_2s1p_10x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_550), siig_2p1s_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_650), siig_2p1s_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2P1S_20x_850), siig_2p1s_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_550), siig_2s1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_650), siig_1s1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S1P_20x_850), siig_1s1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_550), siig_2s1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_650), siig_2s1p_20x },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S1P_20x_850), siig_2s1p_20x },
{ 0, } /* terminate list */
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/scsi/3w-9xxx.c | 12 +++------
drivers/scsi/3w-xxxx.c | 6 +---
drivers/scsi/BusLogic.c | 9 ++----
drivers/scsi/a100u2w.c | 2 +-
drivers/scsi/aacraid/linit.c | 6 ++--
drivers/scsi/dmx3191d.c | 3 +-
drivers/scsi/fdomain.c | 3 +-
drivers/scsi/initio.c | 20 +++++++-------
drivers/scsi/megaraid.c | 9 ++----
drivers/scsi/qla1280.c | 18 ++++---------
drivers/scsi/stex.c | 18 +++++--------
drivers/scsi/sym53c8xx_2/sym_glue.c | 45 +++++++++++-----------------------
drivers/scsi/tmscsim.c | 3 +-
13 files changed, 57 insertions(+), 97 deletions(-)
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
index 36c21b1..eff7307 100644
--- a/drivers/scsi/3w-9xxx.c
+++ b/drivers/scsi/3w-9xxx.c
@@ -2278,14 +2278,10 @@ out_disable_device:
/* PCI Devices supported by this driver */
static struct pci_device_id twa_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9650SE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9690SA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9000), 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9550SX), 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9650SE), 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9690SA), 0},
{ }
};
MODULE_DEVICE_TABLE(pci, twa_pci_tbl);
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index faa0fcf..bb6f53d 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -2400,10 +2400,8 @@ static void tw_remove(struct pci_dev *pdev)
/* PCI Devices supported by this driver */
static struct pci_device_id tw_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_1000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_7000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_1000), 0},
+ { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_7000), 0},
{ }
};
MODULE_DEVICE_TABLE(pci, tw_pci_tbl);
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
index 1ddcf40..fad02a1 100644
--- a/drivers/scsi/BusLogic.c
+++ b/drivers/scsi/BusLogic.c
@@ -3615,12 +3615,9 @@ __setup("BusLogic=", BusLogic_Setup);
#ifdef MODULE
static struct pci_device_id BusLogic_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER), 0},
+ { PCI_VDEVICE(BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC), 0},
+ { PCI_VDEVICE(BUSLOGIC, PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT), 0},
{ }
};
#endif
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 208d6df..d05ecd5 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1214,7 +1214,7 @@ static void __devexit inia100_remove_one(struct pci_dev *pdev)
}
static struct pci_device_id inia100_pci_tbl[] = {
- {PCI_VENDOR_ID_INIT, 0x1060, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(INIT, 0x1060), 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, inia100_pci_tbl);
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 9b97c3e..d0461ab 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -157,9 +157,9 @@ static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
{ 0x9005, 0x0285, 0x1028, PCI_ANY_ID, 0, 0, 57 }, /* Dell Catchall */
{ 0x9005, 0x0285, 0x17aa, PCI_ANY_ID, 0, 0, 58 }, /* Legend Catchall */
- { 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
- { 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
- { 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */
+ { PCI_VDEVICE(ADAPTEC2, 0x0285), 59 }, /* Adaptec Catch All */
+ { PCI_VDEVICE(ADAPTEC2, 0x0286), 60 }, /* Adaptec Rocket Catch All */
+ { PCI_VDEVICE(ADAPTEC2, 0x0288), 61 }, /* Adaptec NEMER/ARK Catch All */
{ 0,}
};
MODULE_DEVICE_TABLE(pci, aac_pci_tbl);
diff --git a/drivers/scsi/dmx3191d.c b/drivers/scsi/dmx3191d.c
index fa738ec..c7bac47 100644
--- a/drivers/scsi/dmx3191d.c
+++ b/drivers/scsi/dmx3191d.c
@@ -140,8 +140,7 @@ static void __devexit dmx3191d_remove_one(struct pci_dev *pdev)
}
static struct pci_device_id dmx3191d_pci_tbl[] = {
- {PCI_VENDOR_ID_DOMEX, PCI_DEVICE_ID_DOMEX_DMX3191D,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
+ {PCI_VDEVICE(DOMEX, PCI_DEVICE_ID_DOMEX_DMX3191D), 4},
{ }
};
MODULE_DEVICE_TABLE(pci, dmx3191d_pci_tbl);
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index 32eef66..d31104a 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -1770,8 +1770,7 @@ struct scsi_host_template fdomain_driver_template = {
#ifdef CONFIG_PCI
static struct pci_device_id fdomain_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_FD, PCI_DEVICE_ID_FD_36C70,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(FD, PCI_DEVICE_ID_FD_36C70), 0UL },
{ }
};
MODULE_DEVICE_TABLE(pci, fdomain_pci_tbl);
diff --git a/drivers/scsi/initio.c b/drivers/scsi/initio.c
index 89a5948..069ecb1 100644
--- a/drivers/scsi/initio.c
+++ b/drivers/scsi/initio.c
@@ -129,11 +129,11 @@ static void i91uSCBPost(u8 * pHcb, u8 * pScb);
/* PCI Devices supported by this driver */
static struct pci_device_id i91u_pci_devices[] = {
- { PCI_VENDOR_ID_INIT, I950_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_INIT, I940_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_INIT, I935_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_INIT, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_DOMEX, I920_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(INIT, I950_DEVICE_ID), 0},
+ { PCI_VDEVICE(INIT, I940_DEVICE_ID), 0},
+ { PCI_VDEVICE(INIT, I935_DEVICE_ID), 0},
+ { PCI_VDEVICE(INIT, I920_DEVICE_ID), 0},
+ { PCI_VDEVICE(DOMEX, I920_DEVICE_ID), 0},
{ }
};
MODULE_DEVICE_TABLE(pci, i91u_pci_devices);
@@ -2978,11 +2978,11 @@ static void initio_remove_one(struct pci_dev *pdev)
MODULE_LICENSE("GPL");
static struct pci_device_id initio_pci_tbl[] = {
- {PCI_VENDOR_ID_INIT, 0x9500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INIT, 0x9400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INIT, 0x9401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INIT, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_DOMEX, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(INIT, 0x9500), 0},
+ {PCI_VDEVICE(INIT, 0x9400), 0},
+ {PCI_VDEVICE(INIT, 0x9401), 0},
+ {PCI_VDEVICE(INIT, 0x0002), 0},
+ {PCI_VDEVICE(DOMEX, 0x0002), 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, initio_pci_tbl);
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 49eb061..956b991 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -4974,12 +4974,9 @@ megaraid_shutdown(struct pci_dev *pdev)
}
static struct pci_device_id megaraid_pci_tbl[] = {
- {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(AMI, PCI_DEVICE_ID_AMI_MEGARAID), 0},
+ {PCI_VDEVICE(AMI, PCI_DEVICE_ID_AMI_MEGARAID2), 0},
+ {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_AMI_MEGARAID3), 0},
{0,}
};
MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 8371d91..e6332b4 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -545,18 +545,12 @@ struct qla_boards {
/* NOTE: the last argument in each entry is used to index ql1280_board_tbl */
static struct pci_device_id qla1280_pci_tbl[] = {
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1080,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1240,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1280,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
- {PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP10160,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160), 0},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1020), 1},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1080), 2},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1240), 3},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1280), 4},
+ {PCI_VDEVICE(QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP10160), 5},
{0,}
};
MODULE_DEVICE_TABLE(pci, qla1280_pci_tbl);
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c
index 8d2a95c..31b383a 100644
--- a/drivers/scsi/stex.c
+++ b/drivers/scsi/stex.c
@@ -1300,27 +1300,23 @@ static struct scsi_host_template driver_template = {
static struct pci_device_id stex_pci_tbl[] = {
/* st_shasta */
- { 0x105a, 0x8350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- st_shasta }, /* SuperTrak EX8350/8300/16350/16300 */
- { 0x105a, 0xc350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- st_shasta }, /* SuperTrak EX12350 */
- { 0x105a, 0x4302, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- st_shasta }, /* SuperTrak EX4350 */
- { 0x105a, 0xe350, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- st_shasta }, /* SuperTrak EX24350 */
+ { PCI_VDEVICE(PROMISE, 0x8350), st_shasta }, /* SuperTrak EX8350/8300/16350/16300 */
+ { PCI_VDEVICE(PROMISE, 0xc350), st_shasta }, /* SuperTrak EX12350 */
+ { PCI_VDEVICE(PROMISE, 0x4302), st_shasta }, /* SuperTrak EX4350 */
+ { PCI_VDEVICE(PROMISE, 0xe350), st_shasta }, /* SuperTrak EX24350 */
/* st_vsc */
- { 0x105a, 0x7250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_vsc },
+ { PCI_VDEVICE(PROMISE, 0x7250), st_vsc },
/* st_yosemite */
{ 0x105a, 0x8650, 0x105a, PCI_ANY_ID, 0, 0, st_yosemite },
/* st_seq */
- { 0x105a, 0x3360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_seq },
+ { PCI_VDEVICE(PROMISE, 0x3360), st_seq },
/* st_yel */
{ 0x105a, 0x8650, 0x1033, PCI_ANY_ID, 0, 0, st_yel },
- { 0x105a, 0x8760, PCI_ANY_ID, PCI_ANY_ID, 0, 0, st_yel },
+ { PCI_VDEVICE(PROMISE, 0x8760), st_yel },
{ } /* terminate list */
};
diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
index 45374d6..3d6f83c 100644
--- a/drivers/scsi/sym53c8xx_2/sym_glue.c
+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
@@ -2072,40 +2072,25 @@ static struct spi_function_template sym2_transport_functions = {
};
static struct pci_device_id sym2_id_table[] __devinitdata = {
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C810,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C820,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, /* new */
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C825,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C815,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C810AP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL }, /* new */
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C860,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C810), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C820), 0UL }, /* new */
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C825), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C815), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_LSI_53C810AP), 0UL }, /* new */
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C860), 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1510,
PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SCSI<<8, 0xffff00, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C896,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C895,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C885,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C896), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C895), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C885), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875), 0UL },
{ PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C1510,
PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SCSI<<8, 0xffff00, 0UL }, /* new */
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C895A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C875A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1010_33,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1010_66,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875J,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_LSI_53C895A), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_LSI_53C875A), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1010_33), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_LSI_53C1010_66), 0UL },
+ { PCI_VDEVICE(LSI_LOGIC, PCI_DEVICE_ID_NCR_53C875J), 0UL },
{ 0, }
};
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index 9a42734..034a87d 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c
@@ -2557,8 +2557,7 @@ static void __devexit dc390_remove_one(struct pci_dev *dev)
}
static struct pci_device_id tmscsim_pci_tbl[] = {
- { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD53C974,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD53C974), 0 },
{ }
};
MODULE_DEVICE_TABLE(pci, tmscsim_pci_tbl);
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/net/3c59x.c | 90 ++++++++++++++++++------------------
drivers/net/8139too.c | 18 ++++----
drivers/net/amd8111e.c | 3 +-
drivers/net/arcnet/com20020-pci.c | 6 +-
drivers/net/bnx2.c | 24 +++-------
drivers/net/bnx2x_main.c | 9 +---
drivers/net/cassini.c | 6 +--
drivers/net/cxgb3/cxgb3_main.c | 2 +-
drivers/net/irda/via-ircc.c | 10 ++--
drivers/net/natsemi.c | 2 +-
drivers/net/ne2k-pci.c | 12 +++---
drivers/net/pci-skeleton.c | 4 +-
drivers/net/sis900.c | 6 +--
drivers/net/spider_net.c | 3 +-
drivers/net/starfire.c | 2 +-
drivers/net/sundance.c | 6 +-
drivers/net/sungem.c | 24 +++-------
drivers/net/tehuti.c | 6 +-
drivers/net/tlan.c | 39 +++++-----------
drivers/net/tokenring/tmspci.c | 8 ++--
drivers/net/tulip/de2104x.c | 6 +--
drivers/net/tulip/de4x5.c | 12 ++---
drivers/net/tulip/tulip_core.c | 28 ++++++------
drivers/net/tulip/uli526x.c | 4 +-
drivers/net/tulip/winbond-840.c | 4 +-
drivers/net/typhoon.c | 18 +++-----
drivers/net/yellowfin.c | 4 +-
27 files changed, 153 insertions(+), 203 deletions(-)
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index c34aee9..6b8d205 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -373,51 +373,51 @@ static struct vortex_chip_info {
static struct pci_device_id vortex_pci_tbl[] = {
- { 0x10B7, 0x5900, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C590 },
- { 0x10B7, 0x5920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C592 },
- { 0x10B7, 0x5970, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C597 },
- { 0x10B7, 0x5950, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_1 },
- { 0x10B7, 0x5951, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_2 },
-
- { 0x10B7, 0x5952, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C595_3 },
- { 0x10B7, 0x9000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_1 },
- { 0x10B7, 0x9001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_2 },
- { 0x10B7, 0x9004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_3 },
- { 0x10B7, 0x9005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_4 },
-
- { 0x10B7, 0x9006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900_5 },
- { 0x10B7, 0x900A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C900B_FL },
- { 0x10B7, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_1 },
- { 0x10B7, 0x9051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905_2 },
- { 0x10B7, 0x9055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_1 },
-
- { 0x10B7, 0x9058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_2 },
- { 0x10B7, 0x905A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905B_FX },
- { 0x10B7, 0x9200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C905C },
- { 0x10B7, 0x9202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C9202 },
- { 0x10B7, 0x9800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C980 },
- { 0x10B7, 0x9805, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C9805 },
-
- { 0x10B7, 0x7646, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CSOHO100_TX },
- { 0x10B7, 0x5055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C555 },
- { 0x10B7, 0x6055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C556 },
- { 0x10B7, 0x6056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C556B },
- { 0x10B7, 0x5b57, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C575 },
-
- { 0x10B7, 0x5057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C575_1 },
- { 0x10B7, 0x5157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE575 },
- { 0x10B7, 0x5257, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE575CT },
- { 0x10B7, 0x6560, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFE656 },
- { 0x10B7, 0x6562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFEM656 },
-
- { 0x10B7, 0x6564, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3CCFEM656_1 },
- { 0x10B7, 0x4500, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C450 },
- { 0x10B7, 0x9201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C920 },
- { 0x10B7, 0x1201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C982A },
- { 0x10B7, 0x1202, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_3C982B },
-
- { 0x10B7, 0x9056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_905BT4 },
- { 0x10B7, 0x9210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_920B_EMB_WNM },
+ { PCI_VDEVICE(3COM, 0x5900), CH_3C590 },
+ { PCI_VDEVICE(3COM, 0x5920), CH_3C592 },
+ { PCI_VDEVICE(3COM, 0x5970), CH_3C597 },
+ { PCI_VDEVICE(3COM, 0x5950), CH_3C595_1 },
+ { PCI_VDEVICE(3COM, 0x5951), CH_3C595_2 },
+
+ { PCI_VDEVICE(3COM, 0x5952), CH_3C595_3 },
+ { PCI_VDEVICE(3COM, 0x9000), CH_3C900_1 },
+ { PCI_VDEVICE(3COM, 0x9001), CH_3C900_2 },
+ { PCI_VDEVICE(3COM, 0x9004), CH_3C900_3 },
+ { PCI_VDEVICE(3COM, 0x9005), CH_3C900_4 },
+
+ { PCI_VDEVICE(3COM, 0x9006), CH_3C900_5 },
+ { PCI_VDEVICE(3COM, 0x900A), CH_3C900B_FL },
+ { PCI_VDEVICE(3COM, 0x9050), CH_3C905_1 },
+ { PCI_VDEVICE(3COM, 0x9051), CH_3C905_2 },
+ { PCI_VDEVICE(3COM, 0x9055), CH_3C905B_1 },
+
+ { PCI_VDEVICE(3COM, 0x9058), CH_3C905B_2 },
+ { PCI_VDEVICE(3COM, 0x905A), CH_3C905B_FX },
+ { PCI_VDEVICE(3COM, 0x9200), CH_3C905C },
+ { PCI_VDEVICE(3COM, 0x9202), CH_3C9202 },
+ { PCI_VDEVICE(3COM, 0x9800), CH_3C980 },
+ { PCI_VDEVICE(3COM, 0x9805), CH_3C9805 },
+
+ { PCI_VDEVICE(3COM, 0x7646), CH_3CSOHO100_TX },
+ { PCI_VDEVICE(3COM, 0x5055), CH_3C555 },
+ { PCI_VDEVICE(3COM, 0x6055), CH_3C556 },
+ { PCI_VDEVICE(3COM, 0x6056), CH_3C556B },
+ { PCI_VDEVICE(3COM, 0x5b57), CH_3C575 },
+
+ { PCI_VDEVICE(3COM, 0x5057), CH_3C575_1 },
+ { PCI_VDEVICE(3COM, 0x5157), CH_3CCFE575 },
+ { PCI_VDEVICE(3COM, 0x5257), CH_3CCFE575CT },
+ { PCI_VDEVICE(3COM, 0x6560), CH_3CCFE656 },
+ { PCI_VDEVICE(3COM, 0x6562), CH_3CCFEM656 },
+
+ { PCI_VDEVICE(3COM, 0x6564), CH_3CCFEM656_1 },
+ { PCI_VDEVICE(3COM, 0x4500), CH_3C450 },
+ { PCI_VDEVICE(3COM, 0x9201), CH_3C920 },
+ { PCI_VDEVICE(3COM, 0x1201), CH_3C982A },
+ { PCI_VDEVICE(3COM, 0x1202), CH_3C982B },
+
+ { PCI_VDEVICE(3COM, 0x9056), CH_905BT4 },
+ { PCI_VDEVICE(3COM, 0x9210), CH_920B_EMB_WNM },
{0,} /* 0 terminated list. */
};
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 8ae72ec..fb4944a 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -232,16 +232,16 @@ static const struct {
static struct pci_device_id rtl8139_pci_tbl[] = {
- {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ {PCI_VDEVICE(REALTEK, 0x8139), RTL8139 },
+ {PCI_VDEVICE(REALTEK, 0x8138), RTL8139 },
{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x1500, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x4033, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x1186, 0x1300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x1186, 0x1340, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x13d1, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x1259, 0xa117, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x1259, 0xa11e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ {PCI_VDEVICE(DLINK, 0x1300), RTL8139 },
+ {PCI_VDEVICE(DLINK, 0x1340), RTL8139 },
+ {PCI_VDEVICE(ABOCOM, 0xab06), RTL8139 },
+ {PCI_VDEVICE(AT, 0xa117), RTL8139 },
+ {PCI_VDEVICE(AT, 0xa11e), RTL8139 },
{0x14ea, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x14ea, 0xab07, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
{0x11db, 0x1234, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
@@ -254,10 +254,10 @@ static struct pci_device_id rtl8139_pci_tbl[] = {
#ifdef CONFIG_SH_SECUREEDGE5410
/* Bogus 8139 silicon reports 8129 without external PROM :-( */
- {0x10ec, 0x8129, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ {PCI_VDEVICE(REALTEK, 0x8129), RTL8139 },
#endif
#ifdef CONFIG_8139TOO_8129
- {0x10ec, 0x8129, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8129 },
+ {PCI_VDEVICE(REALTEK, 0x8129), RTL8129 },
#endif
/* some crazy cards report invalid vendor ids like
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 19831bd..ede19b8 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -115,8 +115,7 @@ MODULE_PARM_DESC(dynamic_ipg, "Enable or Disable dynamic IPG, 1: Enable, 0: Disa
static struct pci_device_id amd8111e_pci_tbl[] = {
- { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD8111E_7462,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD8111E_7462), 0UL },
{ 0, }
};
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c
index dbf4de3..1c65222 100644
--- a/drivers/net/arcnet/com20020-pci.c
+++ b/drivers/net/arcnet/com20020-pci.c
@@ -165,10 +165,10 @@ static struct pci_device_id com20020pci_id_table[] = {
{ 0x1571, 0xa204, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
{ 0x1571, 0xa205, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
{ 0x1571, 0xa206, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
- { 0x10B5, 0x9030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
- { 0x10B5, 0x9050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ { PCI_VDEVICE(PLX, 0x9030), ARC_CAN_10MBIT },
+ { PCI_VDEVICE(PLX, 0x9050), ARC_CAN_10MBIT },
{ 0x14BA, 0x6000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
- { 0x10B5, 0x2200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ARC_CAN_10MBIT },
+ { PCI_VDEVICE(PLX, 0x2200), ARC_CAN_10MBIT },
{0,}
};
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index b70cc99..8a208c6 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -124,24 +124,16 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
PCI_VENDOR_ID_HP, 0x3101, 0, 0, NC370T },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
PCI_VENDOR_ID_HP, 0x3106, 0, 0, NC370I },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706 },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5708,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5708 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5706), BCM5706 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5708), BCM5708 },
{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
PCI_VENDOR_ID_HP, 0x3102, 0, 0, NC370F },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5706S,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5706S },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5708S,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5708S },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709 },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_5709S,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5709S },
- { PCI_VENDOR_ID_BROADCOM, 0x163b,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716 },
- { PCI_VENDOR_ID_BROADCOM, 0x163c,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM5716S },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5706S), BCM5706S },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5708S), BCM5708S },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5709), BCM5709 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_5709S), BCM5709S },
+ { PCI_VDEVICE(BROADCOM, 0x163b), BCM5716 },
+ { PCI_VDEVICE(BROADCOM, 0x163c), BCM5716S },
{ 0, }
};
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index fbf1352..f2cabdc 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -123,12 +123,9 @@ static struct {
static const struct pci_device_id bnx2x_pci_tbl[] = {
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57710,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57710 },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57711,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57711 },
- { PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_NX2_57711E,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, BCM57711E },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57710), BCM57710 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711), BCM57711 },
+ { PCI_VDEVICE(BROADCOM, PCI_DEVICE_ID_NX2_57711E), BCM57711E },
{ 0 }
};
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index eb06667..cd60678 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -237,10 +237,8 @@ static u16 link_modes[] __devinitdata = {
};
static struct pci_device_id cas_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_CASSINI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SATURN,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_CASSINI), 0UL },
+ { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SATURN), 0UL },
{ 0, }
};
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 538dda4..2405b40 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -77,7 +77,7 @@ enum {
#define EEPROM_MAGIC 0x38E2F10C
#define CH_DEVICE(devid, idx) \
- { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, PCI_ANY_ID, 0, 0, idx }
+ { PCI_VDEVICE(CHELSIO, devid), idx }
static const struct pci_device_id cxgb3_pci_tbl[] = {
CH_DEVICE(0x20, 0), /* PE9000 */
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 8647985..ced05d1 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -122,11 +122,11 @@ static void iodelay(int udelay)
}
static struct pci_device_id via_pci_tbl[] = {
- { PCI_VENDOR_ID_VIA, 0x8231, PCI_ANY_ID, PCI_ANY_ID,0,0,0 },
- { PCI_VENDOR_ID_VIA, 0x3109, PCI_ANY_ID, PCI_ANY_ID,0,0,1 },
- { PCI_VENDOR_ID_VIA, 0x3074, PCI_ANY_ID, PCI_ANY_ID,0,0,2 },
- { PCI_VENDOR_ID_VIA, 0x3147, PCI_ANY_ID, PCI_ANY_ID,0,0,3 },
- { PCI_VENDOR_ID_VIA, 0x3177, PCI_ANY_ID, PCI_ANY_ID,0,0,4 },
+ { PCI_VDEVICE(VIA, 0x8231), 0 },
+ { PCI_VDEVICE(VIA, 0x3109), 1 },
+ { PCI_VDEVICE(VIA, 0x3074), 2 },
+ { PCI_VDEVICE(VIA, 0x3147), 3 },
+ { PCI_VDEVICE(VIA, 0x3177), 4 },
{ 0, }
};
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index c9bfe4e..5ba33bc 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -249,7 +249,7 @@ static struct {
static struct pci_device_id natsemi_pci_tbl[] __devinitdata = {
{ PCI_VENDOR_ID_NS, 0x0020, 0x12d9, 0x000c, 0, 0, 0 },
- { PCI_VENDOR_ID_NS, 0x0020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+ { PCI_VDEVICE(NS, 0x0020), 1 },
{ } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, natsemi_pci_tbl);
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 3fcebb7..200c302 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -137,14 +137,14 @@ static struct {
static struct pci_device_id ne2k_pci_tbl[] = {
- { 0x10ec, 0x8029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_RealTek_RTL_8029 },
- { 0x1050, 0x0940, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940 },
- { 0x11f6, 0x1401, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Compex_RL2000 },
- { 0x8e2e, 0x3000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_KTI_ET32P2 },
+ { PCI_VDEVICE(REALTEK, 0x8029), CH_RealTek_RTL_8029 },
+ { PCI_VDEVICE(WINBOND2, 0x0940), CH_Winbond_89C940 },
+ { PCI_VDEVICE(COMPEX, 0x1401), CH_Compex_RL2000 },
+ { PCI_VDEVICE(KTI, 0x3000), CH_KTI_ET32P2 },
{ 0x4a14, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_NetVin_NV5000SC },
- { 0x1106, 0x0926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Via_86C926 },
+ { PCI_VDEVICE(VIA, 0x0926), CH_Via_86C926 },
{ 0x10bd, 0x0e34, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_SureCom_NE34 },
- { 0x1050, 0x5a5a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_W89C940F },
+ { PCI_VDEVICE(WINBOND2, 0x5a5a), CH_Winbond_W89C940F },
{ 0x12c3, 0x0058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80232 },
{ 0x12c3, 0x5598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80229 },
{ 0x8c4a, 0x1980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940_8c4a },
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 8c1f698..6e94f83 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -212,8 +212,8 @@ static struct {
static struct pci_device_id netdrv_pci_tbl[] = {
- {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
- {0x10ec, 0x8138, PCI_ANY_ID, PCI_ANY_ID, 0, 0, NETDRV_CB },
+ {PCI_VDEVICE(REALTEK, 0x8139), RTL8139 },
+ {PCI_VDEVICE(REALTEK, 0x8138), NETDRV_CB },
{0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SMC1211TX },
/* {0x1113, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MPX5030 },*/
{0x1500, 0x1360, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DELTA8139 },
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index a9a897b..4b4850a 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -106,10 +106,8 @@ static const char * card_names[] = {
"SiS 7016 PCI Fast Ethernet"
};
static struct pci_device_id sis900_pci_tbl [] = {
- {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_900,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_900},
- {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7016,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_7016},
+ {PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_900), SIS_900},
+ {PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_7016), SIS_7016},
{0,}
};
MODULE_DEVICE_TABLE (pci, sis900_pci_tbl);
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 90e663f..867bb14 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -72,8 +72,7 @@ MODULE_PARM_DESC(tx_descriptors, "number of descriptors used " \
char spider_net_driver_name[] = "spidernet";
static struct pci_device_id spider_net_pci_tbl[] = {
- { PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SPIDER_NET), 0UL },
{ 0, }
};
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 838cce8..4a55f81 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -302,7 +302,7 @@ enum chipset {
};
static struct pci_device_id starfire_pci_tbl[] = {
- { 0x9004, 0x6915, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_6915 },
+ { PCI_VDEVICE(ADAPTEC, 0x6915), CH_6915 },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, starfire_pci_tbl);
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 545f81b..15fac0a 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -211,9 +211,9 @@ static const struct pci_device_id sundance_pci_tbl[] = {
{ 0x1186, 0x1002, 0x1186, 0x1003, 0, 0, 1 },
{ 0x1186, 0x1002, 0x1186, 0x1012, 0, 0, 2 },
{ 0x1186, 0x1002, 0x1186, 0x1040, 0, 0, 3 },
- { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
- { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
- { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
+ { PCI_VDEVICE(DLINK, 0x1002), 4 },
+ { PCI_VDEVICE(SUNDANCE, 0x0201), 5 },
+ { PCI_VDEVICE(SUNDANCE, 0x0200), 6 },
{ }
};
MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index d2dfe0a..7033c29 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -107,8 +107,7 @@ MODULE_LICENSE("GPL");
#define PFX GEM_MODULE_NAME ": "
static struct pci_device_id gem_pci_tbl[] = {
- { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_GEM), 0UL },
/* These models only differ from the original GEM in
* that their tx/rx fifos are of a different size and
@@ -117,20 +116,13 @@ static struct pci_device_id gem_pci_tbl[] = {
* Apple's GMAC does support gigabit on machines with
* the BCM54xx PHYs. -BenH
*/
- { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_RIO_GEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMACP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_K2_GMAC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
- { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ { PCI_VDEVICE(SUN, PCI_DEVICE_ID_SUN_RIO_GEM), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMACP), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_UNI_N_GMAC2), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_K2_GMAC), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_SH_SUNGEM), 0UL },
+ { PCI_VDEVICE(APPLE, PCI_DEVICE_ID_APPLE_IPID2_GMAC), 0UL },
{0, }
};
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c
index 3c2679c..70dd73a 100644
--- a/drivers/net/tehuti.c
+++ b/drivers/net/tehuti.c
@@ -65,9 +65,9 @@
#include "tehuti.h"
static struct pci_device_id __devinitdata bdx_pci_tbl[] = {
- {0x1FC9, 0x3009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x1FC9, 0x3010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x1FC9, 0x3014, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(TEHUTI, 0x3009), 0},
+ {PCI_VDEVICE(TEHUTI, 0x3010), 0},
+ {PCI_VDEVICE(TEHUTI, 0x3014), 0},
{0}
};
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index 384cb5e..133efc4 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -255,32 +255,19 @@ static struct board {
};
static struct pci_device_id tlan_pci_tbl[] = {
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
- { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
- { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
- { PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10), 0 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100), 1 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I), 2 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER), 3 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B), 4 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI), 5 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D), 6 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I), 7 },
+ { PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2183), 8 },
+ { PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2325), 9 },
+ { PCI_VDEVICE(OLICOM, PCI_DEVICE_ID_OLICOM_OC2326), 10 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100), 11 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2), 12 },
{ 0,}
};
MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index f92fe86..a0c3c94 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -58,10 +58,10 @@ static struct card_info card_info_table[] = {
};
static struct pci_device_id tmspci_pci_tbl[] = {
- { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_TR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { PCI_VENDOR_ID_TCONRAD, PCI_DEVICE_ID_TCONRAD_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3C339, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+ { PCI_VDEVICE(COMPAQ, PCI_DEVICE_ID_COMPAQ_TOKENRING), 0 },
+ { PCI_VDEVICE(SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_TR), 1 },
+ { PCI_VDEVICE(TCONRAD, PCI_DEVICE_ID_TCONRAD_TOKENRING), 2 },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3C339), 3 },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(pci, tmspci_pci_tbl);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 81f054d..d2536c5 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -338,10 +338,8 @@ static unsigned int de_ok_to_advertise (struct de_private *de, u32 new_media);
static struct pci_device_id de_pci_tbl[] = {
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_TULIP), 0 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS), 1 },
{ },
};
MODULE_DEVICE_TABLE(pci, de_pci_tbl);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index eb72d2e..a208844 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -2348,14 +2348,10 @@ static void __devexit de4x5_pci_remove (struct pci_dev *pdev)
}
static struct pci_device_id de4x5_pci_tbl[] = {
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
- { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21142,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_TULIP), 0 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_TULIP_PLUS), 1 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_TULIP_FAST), 2 },
+ { PCI_VDEVICE(DEC, PCI_DEVICE_ID_DEC_21142), 3 },
{ },
};
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 2abb5d3..8f3616d 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -208,8 +208,8 @@ struct tulip_chip_table tulip_tbl[] = {
static struct pci_device_id tulip_pci_tbl[] = {
- { 0x1011, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21140 },
- { 0x1011, 0x0019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DC21143 },
+ { PCI_VDEVICE(DEC, 0x0009), DC21140 },
+ { PCI_VDEVICE(DEC, 0x0019), DC21143 },
{ 0x11AD, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, LC82C168 },
{ 0x10d9, 0x0512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98713 },
{ 0x10d9, 0x0531, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
@@ -220,28 +220,28 @@ static struct pci_device_id tulip_pci_tbl[] = {
{ 0x1317, 0x0985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x1317, 0x1985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x1317, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x13D1, 0xAB02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x13D1, 0xAB03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x13D1, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+ { PCI_VDEVICE(ABOCOM, 0xAB02), COMET },
+ { PCI_VDEVICE(ABOCOM, 0xAB03), COMET },
+ { PCI_VDEVICE(ABOCOM, 0xAB08), COMET },
{ 0x104A, 0x0981, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x104A, 0x2774, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1259, 0xa120, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x11F6, 0x9881, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMPEX9881 },
- { 0x8086, 0x0039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, I21145 },
+ { PCI_VDEVICE(AT, 0xa120), COMET },
+ { PCI_VDEVICE(COMPEX, 0x9881), COMPEX9881 },
+ { PCI_VDEVICE(INTEL, 0x0039), I21145 },
{ 0x1282, 0x9100, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
{ 0x1282, 0x9102, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DM910X },
{ 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
{ 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1186, 0x1541, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1186, 0x1561, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1186, 0x1591, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+ { PCI_VDEVICE(DLINK, 0x1541), COMET },
+ { PCI_VDEVICE(DLINK, 0x1561), COMET },
+ { PCI_VDEVICE(DLINK, 0x1591), COMET },
{ 0x14f1, 0x1803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CONEXANT },
{ 0x1626, 0x8410, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1737, 0xAB09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x1737, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+ { PCI_VDEVICE(LINKSYS, 0xAB09), COMET },
+ { PCI_VDEVICE(LINKSYS, 0xAB08), COMET },
{ 0x17B3, 0xAB08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
- { 0x10b7, 0x9300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* 3Com 3CSOHO100B-TX */
+ { PCI_VDEVICE(3COM, 0x9300), COMET }, /* 3Com 3CSOHO100B-TX */
{ 0x14ea, 0xab08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET }, /* Planex FNW-3602-TX */
{ 0x1414, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
{ } /* terminate list */
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index 9277ce8..090a7d0 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -1782,8 +1782,8 @@ static u16 phy_read_1bit(unsigned long ioaddr, u32 chip_id)
static struct pci_device_id uli526x_pci_tbl[] = {
- { 0x10B9, 0x5261, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5261_ID },
- { 0x10B9, 0x5263, PCI_ANY_ID, PCI_ANY_ID, 0, 0, PCI_ULI5263_ID },
+ { PCI_VDEVICE(AL, 0x5261), PCI_ULI5261_ID },
+ { PCI_VDEVICE(AL, 0x5263), PCI_ULI5263_ID },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, uli526x_pci_tbl);
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 842b1a2..5f86d08 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -220,8 +220,8 @@ enum chip_capability_flags {
static const struct pci_device_id w840_pci_tbl[] = {
{ 0x1050, 0x0840, PCI_ANY_ID, 0x8153, 0, 0, 0 },
- { 0x1050, 0x0840, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { 0x11f6, 0x2011, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+ { PCI_VDEVICE(WINBOND2, 0x0840), 1 },
+ { PCI_VDEVICE(COMPEX, 0x2011), 2 },
{ }
};
MODULE_DEVICE_TABLE(pci, w840_pci_tbl);
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index cf25eb4..c0063c5 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -215,12 +215,9 @@ static struct typhoon_card_info typhoon_card_info[] __devinitdata = {
* bits 12-16 indicate card type: (0) client and (1) server
*/
static struct pci_device_id typhoon_pci_tbl[] = {
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX95 },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX97 },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990), TYPHOON_TX },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95), TYPHOON_TX95 },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97), TYPHOON_TX97 },
{ PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B,
PCI_ANY_ID, 0x1000, 0, 0, TYPHOON_TXM },
{ PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B,
@@ -235,12 +232,9 @@ static struct pci_device_id typhoon_pci_tbl[] = {
PCI_ANY_ID, 0x2101, 0, 0, TYPHOON_FX95SVR },
{ PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_FX,
PCI_ANY_ID, 0x2102, 0, 0, TYPHOON_FX97SVR },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR95,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR95 },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR97,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR97 },
- { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR95), TYPHOON_SVR95 },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR97), TYPHOON_SVR97 },
+ { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR), TYPHOON_SVR },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, typhoon_pci_tbl);
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 3c7a505..97129a7 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -238,8 +238,8 @@ static const struct pci_id_info pci_id_tbl[] = {
};
static const struct pci_device_id yellowfin_pci_tbl[] = {
- { 0x1000, 0x0702, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { 0x1000, 0x0701, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
+ { PCI_VDEVICE(NCR, 0x0702), 0 },
+ { PCI_VDEVICE(NCR, 0x0701), 1 },
{ }
};
MODULE_DEVICE_TABLE (pci, yellowfin_pci_tbl);
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/serial/8250_pci.c | 526 +++++++++++----------------------------------
1 files changed, 123 insertions(+), 403 deletions(-)
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index a07015d..831dd32 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2647,46 +2647,22 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_SUBDEVICE_ID_CONNECT_TECH_PCI_UART_8_485, 0, 0,
pbn_b0_8_1843200_200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_1_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM422,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_4_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM232,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM4,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_4_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM8,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_8_115200 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_7803,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_8_460800 },
- { PCI_VENDOR_ID_SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM8,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_8_115200 },
-
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_GTEK_SERIAL2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_115200 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_921600 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_U530), pbn_b2_bt_1_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM2), pbn_b2_bt_2_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM422), pbn_b2_bt_4_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM232), pbn_b2_bt_2_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM4), pbn_b2_bt_4_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_COMM8), pbn_b2_8_115200 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_7803), pbn_b2_8_460800 },
+ { PCI_VDEVICE(SEALEVEL, PCI_DEVICE_ID_SEALEVEL_UCOMM8), pbn_b2_8_115200 },
+
+ { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_GTEK_SERIAL2), pbn_b2_bt_2_115200 },
+ { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_SPCOM200), pbn_b2_bt_2_921600 },
/*
* VScom SPCOM800, from [email protected]
*/
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_SPCOM800,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_8_921600 },
- { PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_1077,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_4_921600 },
+ { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_SPCOM800), pbn_b2_8_921600 },
+ { PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_1077), pbn_b2_4_921600 },
/* Unknown card - subdevice 0x1584 */
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
PCI_VENDOR_ID_PLX,
@@ -2696,12 +2672,8 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_SUBVENDOR_ID_KEYSPAN,
PCI_SUBDEVICE_ID_KEYSPAN_SX2, 0, 0,
pbn_panacom },
- { PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_QUADMODEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_panacom4 },
- { PCI_VENDOR_ID_PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_panacom2 },
+ { PCI_VDEVICE(PANACOM, PCI_DEVICE_ID_PANACOM_QUADMODEM), pbn_panacom4 },
+ { PCI_VDEVICE(PANACOM, PCI_DEVICE_ID_PANACOM_DUALMODEM), pbn_panacom2 },
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9030,
PCI_VENDOR_ID_ESDGMBH,
PCI_DEVICE_ID_ESDGMBH_CPCIASIO4, 0, 0,
@@ -2741,18 +2713,10 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_ROMULUS,
0x10b5, 0x106a, 0, 0,
pbn_plx_romulus },
- { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_QSC100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_4_115200 },
- { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_DSC100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_2_115200 },
- { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_ESC100D,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_8_115200 },
- { PCI_VENDOR_ID_QUATECH, PCI_DEVICE_ID_QUATECH_ESC100M,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_8_115200 },
+ { PCI_VDEVICE(QUATECH, PCI_DEVICE_ID_QUATECH_QSC100), pbn_b1_4_115200 },
+ { PCI_VDEVICE(QUATECH, PCI_DEVICE_ID_QUATECH_DSC100), pbn_b1_2_115200 },
+ { PCI_VDEVICE(QUATECH, PCI_DEVICE_ID_QUATECH_ESC100D), pbn_b1_8_115200 },
+ { PCI_VDEVICE(QUATECH, PCI_DEVICE_ID_QUATECH_ESC100M), pbn_b1_8_115200 },
{ PCI_VENDOR_ID_SPECIALIX, PCI_DEVICE_ID_OXSEMI_16PCI954,
PCI_VENDOR_ID_SPECIALIX, PCI_SUBDEVICE_ID_SPECIALIX_SPEED4,
0, 0,
@@ -2771,18 +2735,12 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_OXSEMI, 0x950a,
PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL, 0, 0,
pbn_b0_2_115200 },
- { PCI_VENDOR_ID_OXSEMI, 0x950a,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_2_1130000 },
+ { PCI_VDEVICE(OXSEMI, 0x950a), pbn_b0_2_1130000 },
{ PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_C950,
PCI_VENDOR_ID_OXSEMI, PCI_SUBDEVICE_ID_OXSEMI_C950, 0, 0,
pbn_b0_1_921600 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_4_115200 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_921600 },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954), pbn_b0_4_115200 },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI952), pbn_b0_bt_2_921600 },
/*
* Oxford Semiconductor Inc. Tornado PCI express device range.
@@ -2954,102 +2912,42 @@ static struct pci_device_id serial_pci_tbl[] = {
/*
* Digitan DS560-558, from [email protected]
*/
- { PCI_VENDOR_ID_ATT, PCI_DEVICE_ID_ATT_VENUS_MODEM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_1_115200 },
+ { PCI_VDEVICE(ATT, PCI_DEVICE_ID_ATT_VENUS_MODEM), pbn_b1_1_115200 },
/*
* Titan Electronic cards
* The 400L and 800L have a custom setup quirk.
*/
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_2_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_4_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_4_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_100L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_1_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_200L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_2_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_400L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_921600 },
- { PCI_VENDOR_ID_TITAN, PCI_DEVICE_ID_TITAN_800L,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_921600 },
-
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_1_460800 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_1_460800 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_1_460800 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_10x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_1S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_2S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_4S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_921600 },
- { PCI_VENDOR_ID_SIIG, PCI_DEVICE_ID_SIIG_8S_20x_850,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_100), pbn_b0_1_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_200), pbn_b0_2_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_400), pbn_b0_4_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_800B), pbn_b0_4_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_100L), pbn_b1_1_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_200L), pbn_b1_bt_2_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_400L), pbn_b0_bt_4_921600 },
+ { PCI_VDEVICE(TITAN, PCI_DEVICE_ID_TITAN_800L), pbn_b0_bt_8_921600 },
+
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_10x_550), pbn_b2_1_460800 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_10x_650), pbn_b2_1_460800 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_10x_850), pbn_b2_1_460800 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_10x_550), pbn_b2_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_10x_650), pbn_b2_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_10x_850), pbn_b2_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_10x_550), pbn_b2_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_10x_650), pbn_b2_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_10x_850), pbn_b2_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_20x_550), pbn_b0_1_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_20x_650), pbn_b0_1_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_1S_20x_850), pbn_b0_1_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_20x_550), pbn_b0_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_20x_650), pbn_b0_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_2S_20x_850), pbn_b0_bt_2_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_20x_550), pbn_b0_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_20x_650), pbn_b0_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_4S_20x_850), pbn_b0_bt_4_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_8S_20x_550), pbn_b0_bt_8_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_8S_20x_650), pbn_b0_bt_8_921600 },
+ { PCI_VDEVICE(SIIG, PCI_DEVICE_ID_SIIG_8S_20x_850), pbn_b0_bt_8_921600 },
/*
* Computone devices submitted by Doug McNash [email protected]
@@ -3064,9 +2962,7 @@ static struct pci_device_id serial_pci_tbl[] = {
PCI_SUBVENDOR_ID_COMPUTONE, PCI_SUBDEVICE_ID_COMPUTONE_PG6,
0, 0, pbn_computone_6 },
- { PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI95N,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_oxsemi },
+ { PCI_VDEVICE(OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI95N), pbn_oxsemi },
{ PCI_VENDOR_ID_TIMEDIA, PCI_DEVICE_ID_TIMEDIA_1889,
PCI_VENDOR_ID_TIMEDIA, PCI_ANY_ID, 0, 0,
pbn_b0_bt_1_921600 },
@@ -3074,43 +2970,19 @@ static struct pci_device_id serial_pci_tbl[] = {
/*
* AFAVLAB serial card, from Harald Welte <[email protected]>
*/
- { PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_115200 },
- { PCI_VENDOR_ID_AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P030,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_8_115200 },
+ { PCI_VDEVICE(AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P028), pbn_b0_bt_8_115200 },
+ { PCI_VDEVICE(AFAVLAB, PCI_DEVICE_ID_AFAVLAB_P030), pbn_b0_bt_8_115200 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_DSERIAL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_115200 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATRO_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_115200 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATRO_B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_115200 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_OCTO_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_460800 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_OCTO_B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_4_460800 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PORT_PLUS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_460800 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUAD_A,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_460800 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUAD_B,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_2_460800 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_SSERIAL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_1_115200 },
- { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_PORT_650,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_bt_1_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_DSERIAL), pbn_b0_bt_2_115200 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_QUATRO_A), pbn_b0_bt_2_115200 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_QUATRO_B), pbn_b0_bt_2_115200 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_OCTO_A), pbn_b0_bt_4_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_OCTO_B), pbn_b0_bt_4_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_PORT_PLUS), pbn_b0_bt_2_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_QUAD_A), pbn_b0_bt_2_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_QUAD_B), pbn_b0_bt_2_460800 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_SSERIAL), pbn_b0_bt_1_115200 },
+ { PCI_VDEVICE(LAVA, PCI_DEVICE_ID_LAVA_PORT_650), pbn_b0_bt_1_460800 },
/*
* Korenix Jetcard F0/F1 cards (JC1204, JC1208, JC1404, JC1408).
@@ -3139,23 +3011,17 @@ static struct pci_device_id serial_pci_tbl[] = {
/*
* Dell Remote Access Card 4 - [email protected]
*/
- { PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_RAC4,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_1_1382400 },
+ { PCI_VDEVICE(DELL, PCI_DEVICE_ID_DELL_RAC4), pbn_b1_1_1382400 },
/*
* Dell Remote Access Card III - [email protected]
*/
- { PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_RACIII,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_1_1382400 },
+ { PCI_VDEVICE(DELL, PCI_DEVICE_ID_DELL_RACIII), pbn_b1_1_1382400 },
/*
* RAStel 2 port modem, [email protected]
*/
- { PCI_VENDOR_ID_MORETON, PCI_DEVICE_ID_RASTEL_2PORT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_bt_2_115200 },
+ { PCI_VDEVICE(MORETON, PCI_DEVICE_ID_RASTEL_2PORT), pbn_b2_bt_2_115200 },
/*
* EKF addition for i960 Boards form EKF with serial port
@@ -3167,15 +3033,11 @@ static struct pci_device_id serial_pci_tbl[] = {
/*
* Xircom Cardbus/Ethernet combos
*/
- { PCI_VENDOR_ID_XIRCOM, PCI_DEVICE_ID_XIRCOM_X3201_MDM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_115200 },
+ { PCI_VDEVICE(XIRCOM, PCI_DEVICE_ID_XIRCOM_X3201_MDM), pbn_b0_1_115200 },
/*
* Xircom RBM56G cardbus modem - Dirk Arnold (temp entry)
*/
- { PCI_VENDOR_ID_XIRCOM, PCI_DEVICE_ID_XIRCOM_RBM56G,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_115200 },
+ { PCI_VDEVICE(XIRCOM, PCI_DEVICE_ID_XIRCOM_RBM56G), pbn_b0_1_115200 },
/*
* Untested PCI modems, sent in from various folks...
@@ -3198,64 +3060,38 @@ static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_RMP3, 0, 0,
pbn_b1_1_115200 },
- { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_5_115200 },
- { PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_DIVA_AUX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b2_1_115200 },
+ { PCI_VDEVICE(HP, PCI_DEVICE_ID_HP_DIVA), pbn_b0_5_115200 },
+ { PCI_VDEVICE(HP, PCI_DEVICE_ID_HP_DIVA_AUX), pbn_b2_1_115200 },
- { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b3_2_115200 },
- { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM4,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b3_4_115200 },
- { PCI_VENDOR_ID_DCI, PCI_DEVICE_ID_DCI_PCCOM8,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b3_8_115200 },
+ { PCI_VDEVICE(DCI, PCI_DEVICE_ID_DCI_PCCOM2), pbn_b3_2_115200 },
+ { PCI_VDEVICE(DCI, PCI_DEVICE_ID_DCI_PCCOM4), pbn_b3_4_115200 },
+ { PCI_VDEVICE(DCI, PCI_DEVICE_ID_DCI_PCCOM8), pbn_b3_8_115200 },
/*
* Exar Corp. XR17C15[248] Dual/Quad/Octal UART
*/
- { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C152,
- PCI_ANY_ID, PCI_ANY_ID,
- 0,
- 0, pbn_exar_XR17C152 },
- { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C154,
- PCI_ANY_ID, PCI_ANY_ID,
- 0,
- 0, pbn_exar_XR17C154 },
- { PCI_VENDOR_ID_EXAR, PCI_DEVICE_ID_EXAR_XR17C158,
- PCI_ANY_ID, PCI_ANY_ID,
- 0,
- 0, pbn_exar_XR17C158 },
+ { PCI_VDEVICE(EXAR, PCI_DEVICE_ID_EXAR_XR17C152), pbn_exar_XR17C152 },
+ { PCI_VDEVICE(EXAR, PCI_DEVICE_ID_EXAR_XR17C154), pbn_exar_XR17C154 },
+ { PCI_VDEVICE(EXAR, PCI_DEVICE_ID_EXAR_XR17C158), pbn_exar_XR17C158 },
/*
* Topic TP560 Data/Fax/Voice 56k modem (reported by Evan Clarke)
*/
- { PCI_VENDOR_ID_TOPIC, PCI_DEVICE_ID_TOPIC_TP560,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b0_1_115200 },
+ { PCI_VDEVICE(TOPIC, PCI_DEVICE_ID_TOPIC_TP560), pbn_b0_1_115200 },
/*
* ITE
*/
- { PCI_VENDOR_ID_ITE, PCI_DEVICE_ID_ITE_8872,
- PCI_ANY_ID, PCI_ANY_ID,
- 0, 0,
- pbn_b1_bt_1_115200 },
+ { PCI_VDEVICE(ITE, PCI_DEVICE_ID_ITE_8872), pbn_b1_bt_1_115200 },
/*
* IntaShield IS-200
*/
- { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0811 */
+ { PCI_VDEVICE(INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS200), /* 135a.0811 */
pbn_b2_2_115200 },
/*
* IntaShield IS-400
*/
- { PCI_VENDOR_ID_INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, /* 135a.0dc0 */
+ { PCI_VDEVICE(INTASHIELD, PCI_DEVICE_ID_INTASHIELD_IS400), /* 135a.0dc0 */
pbn_b2_4_115200 },
/*
* Perle PCI-RAS cards
@@ -3382,176 +3218,60 @@ static struct pci_device_id serial_pci_tbl[] = {
/*
* PA Semi PA6T-1682M on-chip UART
*/
- { PCI_VENDOR_ID_PASEMI, 0xa004,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_pasemi_1682M },
+ { PCI_VDEVICE(PASEMI, 0xa004), pbn_pasemi_1682M },
/*
* National Instruments
*/
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI23216,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_16_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2328,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_8_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_4_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_2_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2324I,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_4_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI2322I,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_2_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_23216,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_16_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2328,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_8_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_4_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8420_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_2_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8422_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_4_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8422_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_b1_bt_2_115200 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_2 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_2 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_4 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_4 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_2328,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_8 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_2328,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_8 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8430_23216,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_16 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8430_23216,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_16 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8432_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_2 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8432_2322,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_2 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PXI8432_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_4 },
- { PCI_VENDOR_ID_NI, PCI_DEVICE_ID_NI_PCI8432_2324,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0,
- pbn_ni8430_4 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI23216), pbn_b1_16_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI2328), pbn_b1_8_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI2324), pbn_b1_bt_4_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI2322), pbn_b1_bt_2_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI2324I), pbn_b1_bt_4_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI2322I), pbn_b1_bt_2_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8420_23216), pbn_b1_16_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8420_2328), pbn_b1_8_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8420_2324), pbn_b1_bt_4_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8420_2322), pbn_b1_bt_2_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8422_2324), pbn_b1_bt_4_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8422_2322), pbn_b1_bt_2_115200 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8430_2322), pbn_ni8430_2 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8430_2322), pbn_ni8430_2 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8430_2324), pbn_ni8430_4 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8430_2324), pbn_ni8430_4 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8430_2328), pbn_ni8430_8 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8430_2328), pbn_ni8430_8 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8430_23216), pbn_ni8430_16 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8430_23216), pbn_ni8430_16 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8432_2322), pbn_ni8430_2 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8432_2322), pbn_ni8430_2 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PXI8432_2324), pbn_ni8430_4 },
+ { PCI_VDEVICE(NI, PCI_DEVICE_ID_NI_PCI8432_2324), pbn_ni8430_4 },
/*
* ADDI-DATA GmbH communication cards <[email protected]>
*/
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7500,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_4_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7500), pbn_b0_4_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7420,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_2_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7420), pbn_b0_2_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7300,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_1_115200 },
-
- { PCI_VENDOR_ID_ADDIDATA_OLD,
- PCI_DEVICE_ID_ADDIDATA_APCI7800,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b1_8_115200 },
-
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7500_2,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_4_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7300), pbn_b0_1_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7420_2,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_2_115200 },
+ { PCI_VDEVICE(ADDIDATA_OLD, PCI_DEVICE_ID_ADDIDATA_APCI7800), pbn_b1_8_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7300_2,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_1_115200 },
-
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7500_3,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_4_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7500_2), pbn_b0_4_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7420_3,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_2_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7420_2), pbn_b0_2_115200 },
+
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7300_2), pbn_b0_1_115200 },
+
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7500_3), pbn_b0_4_115200 },
+
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7420_3), pbn_b0_2_115200 },
+
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7300_3), pbn_b0_1_115200 },
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7300_3,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_1_115200 },
-
- { PCI_VENDOR_ID_ADDIDATA,
- PCI_DEVICE_ID_ADDIDATA_APCI7800_3,
- PCI_ANY_ID,
- PCI_ANY_ID,
- 0,
- 0,
- pbn_b0_8_115200 },
+ { PCI_VDEVICE(ADDIDATA, PCI_DEVICE_ID_ADDIDATA_APCI7800_3), pbn_b0_8_115200 },
{ PCI_VENDOR_ID_NETMOS, PCI_DEVICE_ID_NETMOS_9835,
PCI_VENDOR_ID_IBM, 0x0299,
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/video/aty/aty128fb.c | 141 +++++++++++---------------------
drivers/video/aty/radeon_base.c | 2 +-
drivers/video/cirrusfb.c | 2 +-
drivers/video/cyber2000fb.c | 9 +--
drivers/video/i810/i810_main.c | 18 ++---
drivers/video/igafb.c | 3 +-
drivers/video/imsttfb.c | 6 +-
drivers/video/matrox/matroxfb_base.c | 33 +++-----
drivers/video/neofb.c | 27 ++----
drivers/video/pm2fb.c | 9 +--
drivers/video/pm3fb.c | 3 +-
drivers/video/pvr2fb.c | 3 +-
drivers/video/riva/fbdev.c | 126 ++++++++++-------------------
drivers/video/savage/savagefb_driver.c | 69 +++++----------
drivers/video/sis/sis_main.h | 20 ++--
drivers/video/tridentfb.c | 42 +++++-----
16 files changed, 182 insertions(+), 331 deletions(-)
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index e4e4d43..81114c0 100644
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -172,100 +172,53 @@ static int aty128_do_resume(struct pci_dev *pdev);
/* supported Rage128 chipsets */
static struct pci_device_id aty128_pci_tbl[] = {
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_LE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_M3_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_LF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_M3 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_MF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_M4 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_ML,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_M4 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PB,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PD,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PG,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PH,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PJ,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PK,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PN,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PQ,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PU,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PV,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PW,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pro },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RG,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RK,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_RL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_pci },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SG,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SH,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SK,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_SN,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128 },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TF,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_TU,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_LE), rage_M3_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_LF), rage_M3 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_MF), rage_M4 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_ML), rage_M4 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PA), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PB), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PC), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PD), rage_128_pro_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PE), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PF), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PG), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PH), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PI), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PJ), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PK), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PL), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PM), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PN), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PO), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PP), rage_128_pro_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PQ), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PR), rage_128_pro_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PS), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PT), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PU), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PV), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PW), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_PX), rage_128_pro },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_RE), rage_128_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_RF), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_RG), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_RK), rage_128_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_RL), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SE), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SF), rage_128_pci },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SG), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SH), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SK), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SL), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SM), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_SN), rage_128 },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TF), rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TL), rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TR), rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TS), rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TT), rage_128_ultra },
+ { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TU), rage_128_ultra },
{ 0, }
};
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 6c37e8e..ce8cbe5 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -99,7 +99,7 @@
#define MIN_MAPPED_VRAM (1024*768*1)
#define CHIP_DEF(id, family, flags) \
- { PCI_VENDOR_ID_ATI, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (flags) | (CHIP_FAMILY_##family) }
+ { PCI_VDEVICE(ATI, id), (flags) | (CHIP_FAMILY_##family) }
static struct pci_device_id radeonfb_pci_table[] = {
/* Radeon Xpress 200m */
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 4c2bf92..ae54ba6 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -260,7 +260,7 @@ static const struct cirrusfb_board_info_rec {
#ifdef CONFIG_PCI
#define CHIP(id, btype) \
- { PCI_VENDOR_ID_CIRRUS, id, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (btype) }
+ { PCI_VDEVICE(CIRRUS, id), (btype) }
static struct pci_device_id cirrusfb_pci_table[] = {
CHIP(PCI_DEVICE_ID_CIRRUS_5436, BT_ALPINE),
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c
index da7c01b..74cb278 100644
--- a/drivers/video/cyber2000fb.c
+++ b/drivers/video/cyber2000fb.c
@@ -1694,12 +1694,9 @@ static struct pci_device_id cyberpro_pci_table[] = {
* { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
* PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_IGA_1682 },
*/
- { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_CYBERPRO_2000 },
- { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_2010,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_CYBERPRO_2010 },
- { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_5000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, ID_CYBERPRO_5000 },
+ { PCI_VDEVICE(INTERG, PCI_DEVICE_ID_INTERG_2000), ID_CYBERPRO_2000 },
+ { PCI_VDEVICE(INTERG, PCI_DEVICE_ID_INTERG_2010), ID_CYBERPRO_2010 },
+ { PCI_VDEVICE(INTERG, PCI_DEVICE_ID_INTERG_5000), ID_CYBERPRO_5000 },
{ 0, }
};
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 2e94019..3bafb31 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -107,19 +107,13 @@ static const char *i810_pci_list[] __devinitdata = {
};
static struct pci_device_id i810fb_pci_tbl[] = {
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810_IG3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82810E_IG,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82810_IG1), 0 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82810_IG3), 1 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82810E_IG), 2 },
/* mvo: added i815 PCI-ID */
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_100,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_NOAGP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
- { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82815_100), 3 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82815_NOAGP), 4 },
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82815_CGC), 5 },
{ 0 },
};
diff --git a/drivers/video/igafb.c b/drivers/video/igafb.c
index 15d2001..31aa350 100644
--- a/drivers/video/igafb.c
+++ b/drivers/video/igafb.c
@@ -571,8 +571,7 @@ int __init igafb_setup(char *options)
module_init(igafb_init);
MODULE_LICENSE("GPL");
static struct pci_device_id igafb_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_INTERG, PCI_DEVICE_ID_INTERG_1682,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(INTERG, PCI_DEVICE_ID_INTERG_1682), 0},
{ }
};
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c
index 15d50b9..93df344 100644
--- a/drivers/video/imsttfb.c
+++ b/drivers/video/imsttfb.c
@@ -1321,10 +1321,8 @@ imsttfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
}
static struct pci_device_id imsttfb_pci_tbl[] = {
- { PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT128,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, IBM },
- { PCI_VENDOR_ID_IMS, PCI_DEVICE_ID_IMS_TT3D,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, TVP },
+ { PCI_VDEVICE(IMS, PCI_DEVICE_ID_IMS_TT128), IBM },
+ { PCI_VDEVICE(IMS, PCI_DEVICE_ID_IMS_TT3D), TVP },
{ 0, }
};
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 8e7a275..9b544f3 100644
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -2109,32 +2109,21 @@ static void pci_remove_matrox(struct pci_dev* pdev) {
static struct pci_device_id matroxfb_devices[] = {
#ifdef CONFIG_FB_MATROX_MILLENIUM
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MIL_2_AGP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_MIL), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_MIL_2), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_MIL_2_AGP), 0},
#endif
#ifdef CONFIG_FB_MATROX_MYSTIQUE
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_MYS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_MYS), 0},
#endif
#ifdef CONFIG_FB_MATROX_G
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_MM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_AGP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_AGP,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G400,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G550,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G100_MM), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G100_AGP), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G200_PCI), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G200_AGP), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G400), 0},
+ {PCI_VDEVICE(MATROX, PCI_DEVICE_ID_MATROX_G550), 0},
#endif
{0, 0,
0, 0, 0, 0, 0}
diff --git a/drivers/video/neofb.c b/drivers/video/neofb.c
index 588527a..f9a5562 100644
--- a/drivers/video/neofb.c
+++ b/drivers/video/neofb.c
@@ -2159,32 +2159,23 @@ static void __devexit neofb_remove(struct pci_dev *dev)
}
static struct pci_device_id neofb_devices[] = {
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2070,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2070},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2070), FB_ACCEL_NEOMAGIC_NM2070},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2090,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2090},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2090), FB_ACCEL_NEOMAGIC_NM2090},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2093,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2093},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2093), FB_ACCEL_NEOMAGIC_NM2093},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2097,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2097},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2097), FB_ACCEL_NEOMAGIC_NM2097},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2160,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2160},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2160), FB_ACCEL_NEOMAGIC_NM2160},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2200},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2200), FB_ACCEL_NEOMAGIC_NM2200},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2230,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2230},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2230), FB_ACCEL_NEOMAGIC_NM2230},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2360,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2360},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2360), FB_ACCEL_NEOMAGIC_NM2360},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_CHIP_NM2380,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_NEOMAGIC_NM2380},
+ {PCI_VDEVICE(NEOMAGIC, PCI_CHIP_NM2380), FB_ACCEL_NEOMAGIC_NM2380},
{0, 0, 0, 0, 0, 0, 0}
};
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 36436ee..4824cc8 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -1752,12 +1752,9 @@ static void __devexit pm2fb_remove(struct pci_dev *pdev)
}
static struct pci_device_id pm2fb_id_table[] = {
- { PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_TVP4020,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2V,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(TI, PCI_DEVICE_ID_TI_TVP4020), 0 },
+ { PCI_VDEVICE(3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2), 0 },
+ { PCI_VDEVICE(3DLABS, PCI_DEVICE_ID_3DLABS_PERMEDIA2V), 0 },
{ 0, }
};
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 6666f45..363c2d0 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -1497,8 +1497,7 @@ static void __devexit pm3fb_remove(struct pci_dev *dev)
}
static struct pci_device_id pm3fb_id_table[] = {
- { PCI_VENDOR_ID_3DLABS, 0x0a,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(3DLABS, 0x0a), 0 },
{ 0, }
};
diff --git a/drivers/video/pvr2fb.c b/drivers/video/pvr2fb.c
index 53f8f11..f5d9b2c 100644
--- a/drivers/video/pvr2fb.c
+++ b/drivers/video/pvr2fb.c
@@ -968,8 +968,7 @@ static void __devexit pvr2fb_pci_remove(struct pci_dev *pdev)
}
static struct pci_device_id pvr2fb_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_NEON250,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(NEC, PCI_DEVICE_ID_NEC_NEON250), 0 },
{ 0, },
};
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index d94c57f..6d025ee 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -109,91 +109,49 @@ static int rivafb_blank(int blank, struct fb_info *info);
* ------------------------------------------------------------------------- */
static struct pci_device_id rivafb_pci_tbl[] = {
- { PCI_VENDOR_ID_NVIDIA_SGS, PCI_DEVICE_ID_NVIDIA_SGS_RIVA128,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UTNT2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_VTNT2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_UVTNT2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_ITNT2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(NVIDIA_SGS, PCI_DEVICE_ID_NVIDIA_SGS_RIVA128), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_TNT2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_UTNT2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_VTNT2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_UVTNT2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_ITNT2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GO), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_460), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440), 0 },
// NF2/IGP version, GeForce 4 MX, NV18
- { PCI_VENDOR_ID_NVIDIA, 0x01f0,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_IGEFORCE2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_DDC,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(NVIDIA, 0x01f0), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO_M32), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500XGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO_M64), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_200), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_IGEFORCE2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_1), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE3_2), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO_DDC), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4600), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4400), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4200), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL), 0 },
+ { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_GO_5200), 0 },
{ 0, } /* terminate list */
};
MODULE_DEVICE_TABLE(pci, rivafb_pci_tbl);
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index 37b135d..79dcc86 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2448,74 +2448,51 @@ static int savagefb_resume(struct pci_dev* dev)
static struct pci_device_id savagefb_devices[] __devinitdata = {
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX128,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_MX128), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX64,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_MX64), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_MX64C,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_MX64C), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IX128SDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IX128SDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IX128DDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IX128DDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IX64SDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IX64SDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IX64DDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IX64DDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IXCSDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IXCSDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SUPSAV_IXCDDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SUPERSAVAGE},
+ {PCI_VDEVICE(S3, PCI_CHIP_SUPSAV_IXCDDR), FB_ACCEL_SUPERSAVAGE},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE4,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE4},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE4), FB_ACCEL_SAVAGE4},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE3D,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE3D},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE3D), FB_ACCEL_SAVAGE3D},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE3D_MV,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE3D_MV},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE3D_MV), FB_ACCEL_SAVAGE3D_MV},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE2000,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE2000},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE2000), FB_ACCEL_SAVAGE2000},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE_MX_MV,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE_MX_MV},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE_MX_MV), FB_ACCEL_SAVAGE_MX_MV},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE_MX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE_MX},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE_MX), FB_ACCEL_SAVAGE_MX},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE_IX_MV,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE_IX_MV},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE_IX_MV), FB_ACCEL_SAVAGE_IX_MV},
- {PCI_VENDOR_ID_S3, PCI_CHIP_SAVAGE_IX,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_SAVAGE_IX},
+ {PCI_VDEVICE(S3, PCI_CHIP_SAVAGE_IX), FB_ACCEL_SAVAGE_IX},
- {PCI_VENDOR_ID_S3, PCI_CHIP_PROSAVAGE_PM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_PROSAVAGE_PM},
+ {PCI_VDEVICE(S3, PCI_CHIP_PROSAVAGE_PM), FB_ACCEL_PROSAVAGE_PM},
- {PCI_VENDOR_ID_S3, PCI_CHIP_PROSAVAGE_KM,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_PROSAVAGE_KM},
+ {PCI_VDEVICE(S3, PCI_CHIP_PROSAVAGE_KM), FB_ACCEL_PROSAVAGE_KM},
- {PCI_VENDOR_ID_S3, PCI_CHIP_S3TWISTER_P,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_S3TWISTER_P},
+ {PCI_VDEVICE(S3, PCI_CHIP_S3TWISTER_P), FB_ACCEL_S3TWISTER_P},
- {PCI_VENDOR_ID_S3, PCI_CHIP_S3TWISTER_K,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_S3TWISTER_K},
+ {PCI_VDEVICE(S3, PCI_CHIP_S3TWISTER_K), FB_ACCEL_S3TWISTER_K},
- {PCI_VENDOR_ID_S3, PCI_CHIP_PROSAVAGE_DDR,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_PROSAVAGE_DDR},
+ {PCI_VDEVICE(S3, PCI_CHIP_PROSAVAGE_DDR), FB_ACCEL_PROSAVAGE_DDR},
- {PCI_VENDOR_ID_S3, PCI_CHIP_PROSAVAGE_DDRK,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, FB_ACCEL_PROSAVAGE_DDRK},
+ {PCI_VDEVICE(S3, PCI_CHIP_PROSAVAGE_DDRK), FB_ACCEL_PROSAVAGE_DDRK},
{0, 0, 0, 0, 0, 0, 0}
};
diff --git a/drivers/video/sis/sis_main.h b/drivers/video/sis/sis_main.h
index 9540e97..578634d 100644
--- a/drivers/video/sis/sis_main.h
+++ b/drivers/video/sis/sis_main.h
@@ -115,18 +115,18 @@ static struct sisfb_chip_info {
static struct pci_device_id __devinitdata sisfb_pci_table[] = {
#ifdef CONFIG_FB_SIS_300
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_630_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_300), 0},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_540_VGA), 1},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_630_VGA), 2},
#endif
#ifdef CONFIG_FB_SIS_315
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_315H, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_315, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_315PRO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_550_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_330, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8},
- { PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_660_VGA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_315H), 3},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_315), 4},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_315PRO), 5},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_550_VGA), 6},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_650_VGA), 7},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_330), 8},
+ { PCI_VDEVICE(SI, PCI_DEVICE_ID_SI_660_VGA), 9},
{ PCI_VENDOR_ID_XGI,PCI_DEVICE_ID_XGI_20, PCI_ANY_ID, PCI_ANY_ID, 0, 0,10},
{ PCI_VENDOR_ID_XGI,PCI_DEVICE_ID_XGI_40, PCI_ANY_ID, PCI_ANY_ID, 0, 0,11},
#endif
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 03a9c35..1d4b9dc 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -1560,27 +1560,27 @@ static void __devexit trident_pci_remove(struct pci_dev *dev)
/* List of boards that we are trying to support */
static struct pci_device_id trident_devices[] = {
- {PCI_VENDOR_ID_TRIDENT, BLADE3D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi7D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEAi1D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEE4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, TGUI9440, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, TGUI9660, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, IMAGE975, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, IMAGE985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9388, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9520, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9525DVD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9397, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBER9397DVD, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPAi1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm8, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_TRIDENT, CYBERBLADEXPm16, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(TRIDENT, BLADE3D), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEi7), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEi7D), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEi1), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEi1D), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEAi1), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEAi1D), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEE4), 0},
+ {PCI_VDEVICE(TRIDENT, TGUI9440), 0},
+ {PCI_VDEVICE(TRIDENT, TGUI9660), 0},
+ {PCI_VDEVICE(TRIDENT, IMAGE975), 0},
+ {PCI_VDEVICE(TRIDENT, IMAGE985), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9320), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9388), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9520), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9525DVD), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9397), 0},
+ {PCI_VDEVICE(TRIDENT, CYBER9397DVD), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEXPAi1), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEXPm8), 0},
+ {PCI_VDEVICE(TRIDENT, CYBERBLADEXPm16), 0},
{0,}
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
.../staging/comedi/drivers/addi-data/addi_common.c | 54 ++++++++++----------
drivers/staging/epl/Edrv8139.c | 2 +-
drivers/staging/vt6655/device_main.c | 2 +-
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index a56535f..87b11ca 100644
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -184,35 +184,35 @@ static DEFINE_PCI_DEVICE_TABLE(addi_apci_tbl) = {
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
#endif
#ifdef CONFIG_APCI_16XX
- {0x15B8, 0x1009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x100A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(ADDIDATA, 0x1009), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x100A), 0},
#endif
#ifdef CONFIG_APCI_3XXX
- {0x15B8, 0x3010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x300F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x300E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3014, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3015, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3016, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3017, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3019, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x301F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3020, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3021, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3023, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x300B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {0x15B8, 0x3024, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3010), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x300F), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x300E), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3013), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3014), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3015), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3016), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3017), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3018), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3019), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301A), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301B), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301C), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301D), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301E), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x301F), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3020), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3021), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3022), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3023), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x300B), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3002), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3003), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3004), 0},
+ {PCI_VDEVICE(ADDIDATA, 0x3024), 0},
#endif
{0}
};
diff --git a/drivers/staging/epl/Edrv8139.c b/drivers/staging/epl/Edrv8139.c
index 44e3f7b..3013480 100644
--- a/drivers/staging/epl/Edrv8139.c
+++ b/drivers/staging/epl/Edrv8139.c
@@ -308,7 +308,7 @@ static void EdrvRemoveOne(struct pci_dev *pPciDev);
// buffers and buffer descriptors and pointers
static struct pci_device_id aEdrvPciTbl[] = {
- {0x10ec, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(REALTEK, 0x8139), 0},
{0,}
};
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index a10ed27..7a2377c 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
};
static struct pci_device_id device_id_table[] __devinitdata = {
-{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (int)&chip_info_table[0]},
+{ PCI_VDEVICE(VIA, 0x3253), (int)&chip_info_table[0]},
{ 0, }
};
#endif
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
sound/oss/kahlua.c | 2 +-
sound/pci/atiixp.c | 8 +++---
sound/pci/atiixp_modem.c | 4 +-
sound/pci/au88x0/au8810.c | 3 +-
sound/pci/au88x0/au8820.c | 3 +-
sound/pci/au88x0/au8830.c | 3 +-
sound/pci/cmipci.c | 10 ++++----
sound/pci/cs4281.c | 2 +-
sound/pci/cs46xx/cs46xx.c | 6 ++--
sound/pci/ens1370.c | 6 ++--
sound/pci/es1938.c | 2 +-
sound/pci/ice1712/ice1712.c | 2 +-
sound/pci/ice1712/ice1724.c | 2 +-
sound/pci/intel8x0.c | 46 +++++++++++++++++++++---------------------
sound/pci/intel8x0m.c | 34 +++++++++++++++---------------
sound/pci/mixart/mixart.c | 2 +-
sound/pci/nm256/nm256.c | 6 ++--
sound/pci/rme32.c | 9 ++-----
sound/pci/rme96.c | 12 +++-------
sound/pci/sonicvibes.c | 2 +-
sound/pci/via82xx.c | 4 +-
sound/pci/via82xx_modem.c | 2 +-
sound/pci/ymfpci/ymfpci.c | 12 +++++-----
23 files changed, 86 insertions(+), 96 deletions(-)
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index c180598..89466b0 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -199,7 +199,7 @@ MODULE_LICENSE("GPL");
*/
static struct pci_device_id id_tbl[] = {
- { PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO), 0 },
{ }
};
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c
index 71515dd..d6752df 100644
--- a/sound/pci/atiixp.c
+++ b/sound/pci/atiixp.c
@@ -287,10 +287,10 @@ struct atiixp {
/*
*/
static struct pci_device_id snd_atiixp_ids[] = {
- { 0x1002, 0x4341, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
- { 0x1002, 0x4361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB300 */
- { 0x1002, 0x4370, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */
- { 0x1002, 0x4382, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB600 */
+ { 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, }
};
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c
index c3136cc..e7e147b 100644
--- a/sound/pci/atiixp_modem.c
+++ b/sound/pci/atiixp_modem.c
@@ -262,8 +262,8 @@ struct atiixp_modem {
/*
*/
static struct pci_device_id snd_atiixp_ids[] = {
- { 0x1002, 0x434d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB200 */
- { 0x1002, 0x4378, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* SB400 */
+ { PCI_VDEVICE(ATI, 0x434d), 0 }, /* SB200 */
+ { PCI_VDEVICE(ATI, 0x4378), 0 }, /* SB400 */
{ 0, }
};
diff --git a/sound/pci/au88x0/au8810.c b/sound/pci/au88x0/au8810.c
index fce22c7..c0e8c6b 100644
--- a/sound/pci/au88x0/au8810.c
+++ b/sound/pci/au88x0/au8810.c
@@ -1,8 +1,7 @@
#include "au8810.h"
#include "au88x0.h"
static struct pci_device_id snd_vortex_ids[] = {
- {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1,},
+ {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_ADVANTAGE), 1,},
{0,}
};
diff --git a/sound/pci/au88x0/au8820.c b/sound/pci/au88x0/au8820.c
index d1fbcce..a652733 100644
--- a/sound/pci/au88x0/au8820.c
+++ b/sound/pci/au88x0/au8820.c
@@ -1,8 +1,7 @@
#include "au8820.h"
#include "au88x0.h"
static struct pci_device_id snd_vortex_ids[] = {
- {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
+ {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_1), 0,},
{0,}
};
diff --git a/sound/pci/au88x0/au8830.c b/sound/pci/au88x0/au8830.c
index d4f2717..6c702ad 100644
--- a/sound/pci/au88x0/au8830.c
+++ b/sound/pci/au88x0/au8830.c
@@ -1,8 +1,7 @@
#include "au8830.h"
#include "au88x0.h"
static struct pci_device_id snd_vortex_ids[] = {
- {PCI_VENDOR_ID_AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
+ {PCI_VDEVICE(AUREAL, PCI_DEVICE_ID_AUREAL_VORTEX_2), 0,},
{0,}
};
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c
index 449fe02..ddcd4a9 100644
--- a/sound/pci/cmipci.c
+++ b/sound/pci/cmipci.c
@@ -2797,11 +2797,11 @@ static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
static struct pci_device_id snd_cmipci_ids[] = {
- {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8738B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_AL, PCI_DEVICE_ID_CMEDIA_CM8738, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {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,},
};
diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c
index f6286f8..e2e0359 100644
--- a/sound/pci/cs4281.c
+++ b/sound/pci/cs4281.c
@@ -495,7 +495,7 @@ struct cs4281 {
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
static struct pci_device_id snd_cs4281_ids[] = {
- { 0x1013, 0x6005, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4281 */
+ { PCI_VDEVICE(CIRRUS, 0x6005), 0, }, /* CS4281 */
{ 0, }
};
diff --git a/sound/pci/cs46xx/cs46xx.c b/sound/pci/cs46xx/cs46xx.c
index c9b3e3d..004a59a 100644
--- a/sound/pci/cs46xx/cs46xx.c
+++ b/sound/pci/cs46xx/cs46xx.c
@@ -65,9 +65,9 @@ module_param_array(mmap_valid, bool, NULL, 0444);
MODULE_PARM_DESC(mmap_valid, "Support OSS mmap.");
static struct pci_device_id snd_cs46xx_ids[] = {
- { 0x1013, 0x6001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4280 */
- { 0x1013, 0x6003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4612 */
- { 0x1013, 0x6004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* CS4615 */
+ { PCI_VDEVICE(CIRRUS, 0x6001), 0, }, /* CS4280 */
+ { PCI_VDEVICE(CIRRUS, 0x6003), 0, }, /* CS4612 */
+ { PCI_VDEVICE(CIRRUS, 0x6004), 0, }, /* CS4615 */
{ 0, }
};
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 18f4d1e..d589bbc 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -445,11 +445,11 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
static struct pci_device_id snd_audiopci_ids[] = {
#ifdef CHIP1370
- { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
+ { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
#endif
#ifdef CHIP1371
- { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */
- { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */
+ { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
+ { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
#endif
{ 0, }
diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index fbd2ac0..b47232c 100644
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -244,7 +244,7 @@ struct es1938 {
static irqreturn_t snd_es1938_interrupt(int irq, void *dev_id);
static struct pci_device_id snd_es1938_ids[] = {
- { 0x125d, 0x1969, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Solo-1 */
+ { PCI_VDEVICE(ESS, 0x1969), 0, }, /* Solo-1 */
{ 0, }
};
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index 0d0cdbd..cecf1ff 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -107,7 +107,7 @@ MODULE_PARM_DESC(dxr_enable, "Enable DXR support for Terratec DMX6FIRE.");
static const struct pci_device_id snd_ice1712_ids[] = {
- { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_ICE_1712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* ICE1712 */
+ { PCI_VDEVICE(ICE, PCI_DEVICE_ID_ICE_1712), 0 }, /* ICE1712 */
{ 0, }
};
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 36ade77..cc84a83 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -93,7 +93,7 @@ MODULE_PARM_DESC(model, "Use the given board model.");
/* Both VT1720 and VT1724 have the same PCI IDs */
static const struct pci_device_id snd_vt1724_ids[] = {
- { PCI_VENDOR_ID_ICE, PCI_DEVICE_ID_VT1724, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+ { PCI_VDEVICE(ICE, PCI_DEVICE_ID_VT1724), 0 },
{ 0, }
};
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 8aa5687..171ada5 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -421,29 +421,29 @@ struct intel8x0 {
};
static struct pci_device_id snd_intel8x0_ids[] = {
- { 0x8086, 0x2415, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */
- { 0x8086, 0x2425, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */
- { 0x8086, 0x2445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */
- { 0x8086, 0x2485, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
- { 0x8086, 0x24c5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH4 */
- { 0x8086, 0x24d5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH5 */
- { 0x8086, 0x25a6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB */
- { 0x8086, 0x266e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH6 */
- { 0x8086, 0x27de, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ICH7 */
- { 0x8086, 0x2698, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL_ICH4 }, /* ESB2 */
- { 0x8086, 0x7195, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
- { 0x1039, 0x7012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7012 */
- { 0x10de, 0x01b1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
- { 0x10de, 0x003a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP04 */
- { 0x10de, 0x006a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
- { 0x10de, 0x0059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK804 */
- { 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8 */
- { 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
- { 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8S */
- { 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP51 */
- { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
- { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
- { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
+ { 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, }
};
diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
index 6ec0fc5..9e7d12e 100644
--- a/sound/pci/intel8x0m.c
+++ b/sound/pci/intel8x0m.c
@@ -220,24 +220,24 @@ struct intel8x0m {
};
static struct pci_device_id snd_intel8x0m_ids[] = {
- { 0x8086, 0x2416, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801AA */
- { 0x8086, 0x2426, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82901AB */
- { 0x8086, 0x2446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 82801BA */
- { 0x8086, 0x2486, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH3 */
- { 0x8086, 0x24c6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH4 */
- { 0x8086, 0x24d6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH5 */
- { 0x8086, 0x266d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH6 */
- { 0x8086, 0x27dd, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* ICH7 */
- { 0x8086, 0x7196, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* 440MX */
- { 0x1022, 0x7446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */
- { 0x1039, 0x7013, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_SIS }, /* SI7013 */
- { 0x10de, 0x01c1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE */
- { 0x10de, 0x0069, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2 */
- { 0x10de, 0x0089, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE2s */
- { 0x10de, 0x00d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */
+ { 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 */
#if 0
- { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */
- { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */
+ { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
+ { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
#endif
{ 0, }
};
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 82bc5b9..a83d196 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -61,7 +61,7 @@ MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard.");
*/
static struct pci_device_id snd_mixart_ids[] = {
- { 0x1057, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* MC8240 */
+ { PCI_VDEVICE(MOTOROLA, 0x0003), 0, }, /* MC8240 */
{ 0, }
};
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 522a040..97a0731 100644
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -263,9 +263,9 @@ struct nm256 {
* PCI ids
*/
static struct pci_device_id snd_nm256_ids[] = {
- {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
- {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {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,},
};
diff --git a/sound/pci/rme32.c b/sound/pci/rme32.c
index d7b966e..f977dba 100644
--- a/sound/pci/rme32.c
+++ b/sound/pci/rme32.c
@@ -227,12 +227,9 @@ struct rme32 {
};
static struct pci_device_id snd_rme32_ids[] = {
- {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
- {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_8,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
- {PCI_VENDOR_ID_XILINX_RME, PCI_DEVICE_ID_RME_DIGI32_PRO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0,},
+ {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,}
};
diff --git a/sound/pci/rme96.c b/sound/pci/rme96.c
index 55fb1c1..c01296c 100644
--- a/sound/pci/rme96.c
+++ b/sound/pci/rme96.c
@@ -232,14 +232,10 @@ struct rme96 {
};
static struct pci_device_id snd_rme96_ids[] = {
- { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
- { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
- { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PRO,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
- { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96_8_PAD_OR_PST,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+ { 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, }
};
diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 7dc60ad..1f6406c 100644
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -243,7 +243,7 @@ struct sonicvibes {
};
static struct pci_device_id snd_sonic_ids[] = {
- { 0x5333, 0xca00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
+ { PCI_VDEVICE(S3, 0xca00), 0, },
{ 0, }
};
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c
index 949fcaf..acfa476 100644
--- a/sound/pci/via82xx.c
+++ b/sound/pci/via82xx.c
@@ -402,9 +402,9 @@ struct via82xx {
static struct pci_device_id snd_via82xx_ids[] = {
/* 0x1106, 0x3058 */
- { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C686_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA686, }, /* 686A */
+ { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686_5), TYPE_CARD_VIA686, }, /* 686A */
/* 0x1106, 0x3059 */
- { PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8233_5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA8233, }, /* VT8233 */
+ { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_5), TYPE_CARD_VIA8233, }, /* VT8233 */
{ 0, }
};
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c
index 0d54e35..47eb615 100644
--- a/sound/pci/via82xx_modem.c
+++ b/sound/pci/via82xx_modem.c
@@ -261,7 +261,7 @@ struct via82xx_modem {
};
static struct pci_device_id snd_via82xx_modem_ids[] = {
- { 0x1106, 0x3068, PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPE_CARD_VIA82XX_MODEM, },
+ { PCI_VDEVICE(VIA, 0x3068), TYPE_CARD_VIA82XX_MODEM, },
{ 0, }
};
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 4af6666..822b60c 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -67,12 +67,12 @@ module_param_array(rear_switch, bool, NULL, 0444);
MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
static struct pci_device_id snd_ymfpci_ids[] = {
- { 0x1073, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724 */
- { 0x1073, 0x000d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF724F */
- { 0x1073, 0x000a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740 */
- { 0x1073, 0x000c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF740C */
- { 0x1073, 0x0010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF744 */
- { 0x1073, 0x0012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* YMF754 */
+ { 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, }
};
--
1.6.3.1.10.g659a0.dirty
Signed-off-by: Joe Perches <[email protected]>
---
drivers/telephony/ixj.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index a913efc..1e941d3 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -283,8 +283,7 @@ static int samplerate = 100;
module_param(ixjdebug, int, 0);
static struct pci_device_id ixj_pci_tbl[] __devinitdata = {
- { PCI_VENDOR_ID_QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ { PCI_VDEVICE(QUICKNET, PCI_DEVICE_ID_QUICKNET_XJ), 0},
{ }
};
--
1.6.3.1.10.g659a0.dirty
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/char/hw_random/amd-rng.c | 4 ++--
> drivers/char/hw_random/geode-rng.c | 3 +--
> 2 files changed, 3 insertions(+), 4 deletions(-)
Acked-by: Matt Mackall <[email protected]>
> diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c
> index cd0ba51..0d8c578 100644
> --- a/drivers/char/hw_random/amd-rng.c
> +++ b/drivers/char/hw_random/amd-rng.c
> @@ -44,8 +44,8 @@
> * want to register another driver on the same PCI id.
> */
> static const struct pci_device_id pci_tbl[] = {
> - { 0x1022, 0x7443, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> - { 0x1022, 0x746b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> + { PCI_VDEVICE(AMD, 0x7443), 0, },
> + { PCI_VDEVICE(AMD, 0x746b), 0, },
> { 0, }, /* terminate list */
> };
> MODULE_DEVICE_TABLE(pci, pci_tbl);
> diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c
> index 64d513f..4c4d4e1 100644
> --- a/drivers/char/hw_random/geode-rng.c
> +++ b/drivers/char/hw_random/geode-rng.c
> @@ -46,8 +46,7 @@
> * want to register another driver on the same PCI id.
> */
> static const struct pci_device_id pci_tbl[] = {
> - { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LX_AES,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },
> + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_LX_AES), 0, },
> { 0, }, /* terminate list */
> };
> MODULE_DEVICE_TABLE(pci, pci_tbl);
--
http://selenic.com : development and support for Mercurial and Linux
Signed-off-by: Joe Perches <[email protected]>
---
drivers/ata/ata_piix.c | 98 ++++++++++++++++++++++++------------------------
drivers/ata/pata_scc.c | 3 +-
2 files changed, 50 insertions(+), 51 deletions(-)
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index d0a14cf..d161b06 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -182,115 +182,115 @@ static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
/* Intel PIIX3 for the 430HX etc */
- { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
+ { PCI_VDEVICE(INTEL, 0x7010), piix_pata_mwdma },
/* VMware ICH4 */
{ 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw },
/* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
/* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
- { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7111), piix_pata_33 },
/* Intel PIIX4 */
- { 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7199), piix_pata_33 },
/* Intel PIIX4 */
- { 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x7601), piix_pata_33 },
/* Intel PIIX */
- { 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x84CA), piix_pata_33 },
/* Intel ICH (i810, i815, i840) UDMA 66*/
- { 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
+ { PCI_VDEVICE(INTEL, 0x2411), ich_pata_66 },
/* Intel ICH0 : UDMA 33*/
- { 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
+ { PCI_VDEVICE(INTEL, 0x2421), ich_pata_33 },
/* Intel ICH2M */
- { 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x244A), ich_pata_100 },
/* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
- { 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x244B), ich_pata_100 },
/* Intel ICH3M */
- { 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x248A), ich_pata_100 },
/* Intel ICH3 (E7500/1) UDMA 100 */
- { 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x248B), ich_pata_100 },
/* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
- { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24CA), ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24CB), ich_pata_100 },
/* Intel ICH5 */
- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x24DB), ich_pata_100 },
/* C-ICH (i810E2) */
- { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x245B), ich_pata_100 },
/* ESB (855GME/875P + 6300ESB) UDMA 100 */
- { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x25A2), ich_pata_100 },
/* ICH6 (and 6) (i915) UDMA 100 */
- { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x266F), ich_pata_100 },
/* ICH7/7-R (i945, i975) UDMA 100*/
- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
- { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
+ { PCI_VDEVICE(INTEL, 0x27DF), ich_pata_100_nomwdma1 },
+ { PCI_VDEVICE(INTEL, 0x269E), ich_pata_100_nomwdma1 },
/* ICH8 Mobile PATA Controller */
- { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
+ { PCI_VDEVICE(INTEL, 0x2850), ich_pata_100 },
/* SATA ports */
/* 82801EB (ICH5) */
- { 0x8086, 0x24d1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x24d1), ich5_sata },
/* 82801EB (ICH5) */
- { 0x8086, 0x24df, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x24df), ich5_sata },
/* 6300ESB (ICH5 variant with broken PCS present bits) */
- { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x25a3), ich5_sata },
/* 6300ESB pretending RAID */
- { 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
+ { PCI_VDEVICE(INTEL, 0x25b0), ich5_sata },
/* 82801FB/FW (ICH6/ICH6W) */
- { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2651), ich6_sata },
/* 82801FR/FRW (ICH6R/ICH6RW) */
- { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2652), ich6_sata },
/* 82801FBM ICH6M (ICH6R with only port 0 and 2 implemented).
* Attach iff the controller is in IDE mode. */
{ 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_IDE << 8, 0xffff00, ich6m_sata },
/* 82801GB/GR/GH (ICH7, identical to ICH6) */
- { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x27c0), ich6_sata },
/* 2801GBM/GHM (ICH7M, identical to ICH6M) */
- { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6m_sata },
+ { PCI_VDEVICE(INTEL, 0x27c4), ich6m_sata },
/* Enterprise Southbridge 2 (631xESB/632xESB) */
- { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
+ { PCI_VDEVICE(INTEL, 0x2680), ich6_sata },
/* SATA Controller 1 IDE (ICH8) */
- { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2820), ich8_sata },
/* SATA Controller 2 IDE (ICH8) */
- { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2825), ich8_2port_sata },
/* Mobile SATA Controller IDE (ICH8M), Apple */
{ 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a1, 0, 0, ich8m_apple_sata },
{ 0x8086, 0x2828, 0x106b, 0x00a3, 0, 0, ich8m_apple_sata },
/* Mobile SATA Controller IDE (ICH8M) */
- { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2828), ich8_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x2920), ich8_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2921), ich8_2port_sata },
/* SATA Controller IDE (ICH9) */
- { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2926), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x2928), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x292d), ich8_2port_sata },
/* SATA Controller IDE (ICH9M) */
- { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x292e), ich8_sata },
/* SATA Controller IDE (Tolapai) */
- { 0x8086, 0x5028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, tolapai_sata },
+ { PCI_VDEVICE(INTEL, 0x5028), tolapai_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a00, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3a00), ich8_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3a06), ich8_2port_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3a20), ich8_sata },
/* SATA Controller IDE (ICH10) */
- { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3a26), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b20), ich8_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b21, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b21), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b26), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b28, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b28), ich8_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+ { PCI_VDEVICE(INTEL, 0x3b2d), ich8_2port_sata },
/* SATA Controller IDE (PCH) */
- { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+ { PCI_VDEVICE(INTEL, 0x3b2e), ich8_sata },
{ } /* terminate list */
};
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 4257d6b..13fb022 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -168,8 +168,7 @@ static const unsigned long JCACTSELtbl[2][7] = {
};
static const struct pci_device_id scc_pci_tbl[] = {
- {PCI_VENDOR_ID_TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA,
- PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ {PCI_VDEVICE(TOSHIBA_2, PCI_DEVICE_ID_TOSHIBA_SCC_ATA), 0},
{ } /* terminate list */
};
--
1.6.3.1.10.g659a0.dirty
At Wed, 24 Jun 2009 22:13:35 -0700,
Joe Perches wrote:
> diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
> index 18f4d1e..d589bbc 100644
> --- a/sound/pci/ens1370.c
> +++ b/sound/pci/ens1370.c
> @@ -445,11 +445,11 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
>
> static struct pci_device_id snd_audiopci_ids[] = {
> #ifdef CHIP1370
> - { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
> + { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
> #endif
> #ifdef CHIP1371
> - { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */
> - { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */
> + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
> + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
> { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
Any reason not to covert this?
thanks,
Takashi
On Thu, 2009-06-25 at 07:43 +0200, Takashi Iwai wrote:
> At Wed, 24 Jun 2009 22:13:35 -0700,
> Joe Perches wrote:
> > diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
> > index 18f4d1e..d589bbc 100644
> > --- a/sound/pci/ens1370.c
> > +++ b/sound/pci/ens1370.c
> > @@ -445,11 +445,11 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
> >
> > static struct pci_device_id snd_audiopci_ids[] = {
> > #ifdef CHIP1370
> > - { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
> > + { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
> > #endif
> > #ifdef CHIP1371
> > - { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */
> > - { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */
> > + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
> > + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
> > { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
>
> Any reason not to covert this?
Not really, 0x1102 maps to 2 PCI entries, CREATIVE and ECTIVA.
The script wouldn't know which is appropriate to use, so I skipped it.
The script is in 0/19: http://lkml.org/lkml/2009/6/25/21
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> drivers/net/typhoon.c | 18 +++-----
It's not a huge leap in readability, but whaddayagonnado?
Acked-by: Dave Dillow <[email protected]>
> diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
> index cf25eb4..c0063c5 100644
> --- a/drivers/net/typhoon.c
> +++ b/drivers/net/typhoon.c
> @@ -215,12 +215,9 @@ static struct typhoon_card_info typhoon_card_info[] __devinitdata = {
> * bits 12-16 indicate card type: (0) client and (1) server
> */
> static struct pci_device_id typhoon_pci_tbl[] = {
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0,TYPHOON_TX },
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX95 },
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_TX97 },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990), TYPHOON_TX },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_95), TYPHOON_TX95 },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990_TX_97), TYPHOON_TX97 },
> { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B,
> PCI_ANY_ID, 0x1000, 0, 0, TYPHOON_TXM },
> { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990B,
> @@ -235,12 +232,9 @@ static struct pci_device_id typhoon_pci_tbl[] = {
> PCI_ANY_ID, 0x2101, 0, 0, TYPHOON_FX95SVR },
> { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990_FX,
> PCI_ANY_ID, 0x2102, 0, 0, TYPHOON_FX97SVR },
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR95,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR95 },
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR97,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR97 },
> - { PCI_VENDOR_ID_3COM, PCI_DEVICE_ID_3COM_3CR990SVR,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, TYPHOON_SVR },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR95), TYPHOON_SVR95 },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR97), TYPHOON_SVR97 },
> + { PCI_VDEVICE(3COM, PCI_DEVICE_ID_3COM_3CR990SVR), TYPHOON_SVR },
> { 0, }
> };
> MODULE_DEVICE_TABLE(pci, typhoon_pci_tbl);
On Thu, Jun 25, 2009 at 12:36:18AM -0500, Matt Mackall wrote:
> On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> > Signed-off-by: Joe Perches <[email protected]>
> > ---
> > drivers/char/hw_random/amd-rng.c | 4 ++--
> > drivers/char/hw_random/geode-rng.c | 3 +--
> > 2 files changed, 3 insertions(+), 4 deletions(-)
>
> Acked-by: Matt Mackall <[email protected]>
Patch applied. Thanks!
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
At Wed, 24 Jun 2009 22:47:12 -0700,
Joe Perches wrote:
>
> On Thu, 2009-06-25 at 07:43 +0200, Takashi Iwai wrote:
> > At Wed, 24 Jun 2009 22:13:35 -0700,
> > Joe Perches wrote:
> > > diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
> > > index 18f4d1e..d589bbc 100644
> > > --- a/sound/pci/ens1370.c
> > > +++ b/sound/pci/ens1370.c
> > > @@ -445,11 +445,11 @@ static irqreturn_t snd_audiopci_interrupt(int irq, void *dev_id);
> > >
> > > static struct pci_device_id snd_audiopci_ids[] = {
> > > #ifdef CHIP1370
> > > - { 0x1274, 0x5000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1370 */
> > > + { PCI_VDEVICE(ENSONIQ, 0x5000), 0, }, /* ES1370 */
> > > #endif
> > > #ifdef CHIP1371
> > > - { 0x1274, 0x1371, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1371 */
> > > - { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */
> > > + { PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
> > > + { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
> > > { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
> >
> > Any reason not to covert this?
>
> Not really, 0x1102 maps to 2 PCI entries, CREATIVE and ECTIVA.
> The script wouldn't know which is appropriate to use, so I skipped it.
Heh, but it's obvious when you read the commend in the entry :)
(Though, this is a drawback of using PCI_* definition. The definition
isn't always unique, so a simple grep isn't possible to search for
a device with 1102:8938. So, I'm not 100% fan of such a conversion
although I agree that this improves readability much.)
Anyway, could you change that entry and repost? Nno need to repost
all in the series, of course :)
thanks,
Takashi
On Thu, 2009-06-25 at 07:55 +0200, Takashi Iwai wrote:
> Heh, but it's obvious when you read the commend in the entry :)
Scripts are automatic. Now you want me to work...
> Anyway, could you change that entry and repost? Nno need to repost
> all in the series, of course :)
Here's a patch on top of the others to use CREATIVE and ECTIVA
Signed-off-by: Joe Perches <[email protected]>
sound/pci/ca0106/ca0106_main.c | 2 +-
sound/pci/emu10k1/emu10k1.c | 6 +++---
sound/pci/emu10k1/emu10k1x.c | 2 +-
sound/pci/ens1370.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 57b992a..f24bf1e 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1876,7 +1876,7 @@ static int snd_ca0106_resume(struct pci_dev *pci)
// PCI IDs
static struct pci_device_id snd_ca0106_ids[] = {
- { 0x1102, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Audigy LS or Live 24bit */
+ { PCI_VDEVICE(CREATIVE, 0x0007), 0 }, /* Audigy LS or Live 24bit */
{ 0, }
};
MODULE_DEVICE_TABLE(pci, snd_ca0106_ids);
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c
index c7f3b99..168af67 100644
--- a/sound/pci/emu10k1/emu10k1.c
+++ b/sound/pci/emu10k1/emu10k1.c
@@ -77,9 +77,9 @@ MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
* Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value Model:SB0400
*/
static struct pci_device_id snd_emu10k1_ids[] = {
- { 0x1102, 0x0002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* EMU10K1 */
- { 0x1102, 0x0004, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy */
- { 0x1102, 0x0008, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 }, /* Audigy 2 Value SB0400 */
+ { PCI_VDEVICE(CREATIVE, 0x0002), 0 }, /* EMU10K1 */
+ { PCI_VDEVICE(CREATIVE, 0x0004), 1 }, /* Audigy */
+ { PCI_VDEVICE(CREATIVE, 0x0008), 1 }, /* Audigy 2 Value SB0400 */
{ 0, }
};
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 4d3ad79..36e08bd 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1607,7 +1607,7 @@ static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)
// PCI IDs
static struct pci_device_id snd_emu10k1x_ids[] = {
- { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, /* Dell OEM version (EMU10K1) */
+ { PCI_VDEVICE(CREATIVE, 0x0006), 0 }, /* Dell OEM version (EMU10K1) */
{ 0, }
};
MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index d589bbc..2b82c5c 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -450,7 +450,7 @@ static struct pci_device_id snd_audiopci_ids[] = {
#ifdef CHIP1371
{ PCI_VDEVICE(ENSONIQ, 0x1371), 0, }, /* ES1371 */
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
- { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */
+ { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
#endif
{ 0, }
};
On Wed, Jun 24, 2009 at 10:13:28PM -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/tulip/de2104x.c | 6 +--
> drivers/net/tulip/de4x5.c | 12 ++---
> drivers/net/tulip/tulip_core.c | 28 ++++++------
> drivers/net/tulip/uli526x.c | 4 +-
> drivers/net/tulip/winbond-840.c | 4 +-
Tulip bits look fine.
Acked-by: Grant Grundler <[email protected]>
thanks,
grant
At Wed, 24 Jun 2009 23:18:02 -0700,
Joe Perches wrote:
>
> On Thu, 2009-06-25 at 07:55 +0200, Takashi Iwai wrote:
> > Heh, but it's obvious when you read the commend in the entry :)
>
> Scripts are automatic. Now you want me to work...
It's good to train your brain sometimes :)
>
> > Anyway, could you change that entry and repost? Nno need to repost
> > all in the series, of course :)
>
> Here's a patch on top of the others to use CREATIVE and ECTIVA
>
> Signed-off-by: Joe Perches <[email protected]>
Thanks, applied now.
Takashi
On Thursday 25 June 2009, Joe Perches wrote:
> drivers/net/spider_net.c ? ? ? ? ?| ? ?3 +-
spider_net bits look fine.
Acked-by: Jens Osterkamp <[email protected]>
Thanks,
Jens
----- Message d'origine -----
De: Joe Perches <[email protected]>
Date: Wed, 24 Jun 2009 22:13:28 -0700
Sujet: [PATCH 12/19] drivers/net: Use PCI_VDEVICE
> drivers/net/sis900.c | 6 +--
sis900 changes ok.
Acked-by: Daniele Venzano <[email protected]>
--
Daniele Venzano
[email protected]
http://www.brownhat.org
> --- a/drivers/staging/vt6655/device_main.c
> +++ b/drivers/staging/vt6655/device_main.c
> @@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
> };
>
> static struct pci_device_id device_id_table[] __devinitdata = {
> -{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (int)&chip_info_table[0]},
> +{ PCI_VDEVICE(VIA, 0x3253), (int)&chip_info_table[0]},
Hmm, pointer chopped to 4 bytes on 64-bit. Could you fix that up too?
On Thu, 2009-06-25 at 16:24 +0200, Jiri Slaby wrote:
> > --- a/drivers/staging/vt6655/device_main.c
> > +++ b/drivers/staging/vt6655/device_main.c
> > @@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
> > };
> >
> > static struct pci_device_id device_id_table[] __devinitdata = {
> > -{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (int)&chip_info_table[0]},
> > +{ PCI_VDEVICE(VIA, 0x3253), (int)&chip_info_table[0]},
>
> Hmm, pointer chopped to 4 bytes on 64-bit. Could you fix that up too?
In addition to original patch
drivers/staging/vt6655: cast pci_device_id driver_data to appropriate type
Signed-off-by: Joe Perches <[email protected]>
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 7a2377c..a347087 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
};
static struct pci_device_id device_id_table[] __devinitdata = {
-{ PCI_VDEVICE(VIA, 0x3253), (int)&chip_info_table[0]},
+{ PCI_VDEVICE(VIA, 0x3253), (kernel_ulong_t)&chip_info_table[0]},
{ 0, }
};
#endif
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/wireless/ipw2x00/ipw2200.c | 10 +++++-----
> drivers/net/wireless/prism54/islpci_hotplug.c | 4 +---
> 2 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
> index 44c29b3..d726b3c 100644
> --- a/drivers/net/wireless/ipw2x00/ipw2200.c
> +++ b/drivers/net/wireless/ipw2x00/ipw2200.c
> @@ -11436,11 +11436,11 @@ static struct pci_device_id card_ids[] = {
> {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2754, 0, 0, 0},
> {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2761, 0, 0, 0},
> {PCI_VENDOR_ID_INTEL, 0x1043, 0x8086, 0x2762, 0, 0, 0},
> - {PCI_VENDOR_ID_INTEL, 0x104f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> - {PCI_VENDOR_ID_INTEL, 0x4220, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
> - {PCI_VENDOR_ID_INTEL, 0x4221, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* BG */
> - {PCI_VENDOR_ID_INTEL, 0x4223, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
> - {PCI_VENDOR_ID_INTEL, 0x4224, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, /* ABG */
> + {PCI_VDEVICE(INTEL, 0x104f), 0},
> + {PCI_VDEVICE(INTEL, 0x4220), 0}, /* BG */
> + {PCI_VDEVICE(INTEL, 0x4221), 0}, /* BG */
> + {PCI_VDEVICE(INTEL, 0x4223), 0}, /* ABG */
> + {PCI_VDEVICE(INTEL, 0x4224), 0}, /* ABG */
>
> /* required last entry */
> {0,}
ack for the ipw2200 parts
Thank you
Reinette
On Wed, Jun 24, 2009 at 10:13:34PM -0700, Joe Perches wrote:
<snip>
> + { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TS), rage_128_ultra },
> + { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TT), rage_128_ultra },
> + { PCI_VDEVICE(ATI, PCI_DEVICE_ID_ATI_RAGE128_TU), rage_128_ultra },
> { 0, }
> };
Perhaps there should be a PCI_VDDEVICE() or something for this type of
stuff? Would make things even shorter.
Also PCI_VDEVICE() does not use named initializers for some reason.
Might be worth fixing.
It seems your script missed atyfb. It could use PCI_VDEVICE() too.
--
Ville Syrj?l?
[email protected]
http://www.sci.fi/~syrjala/
On Fri, 2009-06-26 at 12:54 +0300, Ville Syrjälä wrote:
> Perhaps there should be a PCI_VDDEVICE() or something for this type of
> stuff? Would make things even shorter.
drivers/edac/edac_core.h has:
#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
PCI_DEVICE_ID_ ## vend ## _ ## dev
Try submitting a patch and see what happens...
> Also PCI_VDEVICE() does not use named initializers for some reason.
> Might be worth fixing.
Perhaps that's to avoid mixing named and unnamed initializers.
> It seems your script missed atyfb. It could use PCI_VDEVICE() too.
Can you show an example please?
On Fri, Jun 26, 2009 at 09:35:26AM -0700, Joe Perches wrote:
> On Fri, 2009-06-26 at 12:54 +0300, Ville Syrj?l? wrote:
> > Perhaps there should be a PCI_VDDEVICE() or something for this type of
> > stuff? Would make things even shorter.
>
> drivers/edac/edac_core.h has:
>
> #define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
> PCI_DEVICE_ID_ ## vend ## _ ## dev
>
> Try submitting a patch and see what happens...
Too lazy. I was thinking that since you're already looking at
this stuff you might be tricked into doing some more work.
> > It seems your script missed atyfb. It could use PCI_VDEVICE() too.
>
> Can you show an example please?
I didn't read you script and didn't look at the patches too closely. It
seems you only converted the open-coded stuff and not stuff already
using the PCI_DEVICE() macro. atyfb falls into this category.
--
Ville Syrj?l?
[email protected]
http://www.sci.fi/~syrjala/
On Wed, 2009-06-24 at 22:13 -0700, Joe Perches wrote:
> Signed-off-by: Joe Perches <[email protected]>
OK, so there's no description whatsoever how am I supposed to divine the
reasons for doing this?
Because if I look at an example:
> --- a/drivers/scsi/3w-9xxx.c
> +++ b/drivers/scsi/3w-9xxx.c
> @@ -2278,14 +2278,10 @@ out_disable_device:
>
> /* PCI Devices supported by this driver */
> static struct pci_device_id twa_pci_tbl[] __devinitdata = {
> - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9650SE,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9690SA,
> - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9000), 0},
> + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9550SX), 0},
> + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9650SE), 0},
> + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9690SA), 0},
It appears to take PCI matching on vendor device with any subvendor,
device and reproduce the results with a macro, which, for good measure
pastes PCI_VENDOR_ID on to the first argument but *doesn't* paste
PCI_DEVICE_ID on to the second?
So it transforms a relatively opaque initialiser which most people would
have to look up in pci.h into another relatively opaque initialiser
indirected via a macro, so now I have to look up both the structure and
the macro to figure out what's going on.
If that's all it does, I'm having a hard time seeing any actual
improvement here.
James
On Sat, 2009-06-27 at 12:20 -0500, James Bottomley wrote:
> OK, so there's no description whatsoever how am I supposed to divine the
> reasons for doing this?
You might look at the 0/19 patch description.
http://lkml.org/lkml/2009/6/25/21
> Because if I look at an example:
>
> > --- a/drivers/scsi/3w-9xxx.c
> > +++ b/drivers/scsi/3w-9xxx.c
> > @@ -2278,14 +2278,10 @@ out_disable_device:
> >
> > /* PCI Devices supported by this driver */
> > static struct pci_device_id twa_pci_tbl[] __devinitdata = {
> > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
> > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
> > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9650SE,
> > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9690SA,
> > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9000), 0},
> > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9550SX), 0},
> > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9650SE), 0},
> > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9690SA), 0},
>
> It appears to take PCI matching on vendor device with any subvendor,
> device and reproduce the results with a macro, which, for good measure
> pastes PCI_VENDOR_ID on to the first argument but *doesn't* paste
> PCI_DEVICE_ID on to the second?
A single macro can't use both a named constant and a magic number
as the second argument.
Today, only about half of the pci device declarations use
named constants, mostly defined in pci_ids.h
Style 1: PCI_VDEVICE(VENDOR, PCI_DEVICE_ID_<foo>)
$ grep -rP --include=*.[ch] \
"\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
wc -l
351
Style 2: PCI_VDEVICE(VENDOR, 0x<hex#>)
$ grep -rP --include=*.[ch] \
"\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
wc -l
287
PCI_DEVICE(VENDOR, PCI_DEVICE_ID_<foo>)
$ grep -rP --include=*.[ch] \
"\bPCI_DEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
wc -l
373
PCI_DEVICE(VENDOR, 0x<foo>)
$ grep -rP --include=*.[ch] \
"\bPCI_DEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
wc -l
320
After this patchset:
$ grep -rP --include=*.[ch] \
"\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
wc -l
831
$ grep -rP --include=*.[ch] \
"\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
wc -l
571
> So it transforms a relatively opaque initialiser which most people would
> have to look up in pci.h into another relatively opaque initialiser
> indirected via a macro, so now I have to look up both the structure and
> the macro to figure out what's going on.
>
> If that's all it does, I'm having a hard time seeing any actual
> improvement here.
Greater standardization of declarations across multiple files.
Do you have a suggestion or preference for another macro name
for the named constants uses?
drivers/edac/edac_core.h has:
#define PCI_VEND_DEV(vend, dev) PCI_VENDOR_ID_ ## vend, \
PCI_DEVICE_ID_ ## vend ## _ ## dev
cheers, Joe
On Sat, 2009-06-27 at 12:53 -0700, Joe Perches wrote:
> On Sat, 2009-06-27 at 12:20 -0500, James Bottomley wrote:
> > OK, so there's no description whatsoever how am I supposed to divine the
> > reasons for doing this?
>
> You might look at the 0/19 patch description.
> http://lkml.org/lkml/2009/6/25/21
That's not really an adequate admonishment because it didn't go to the
list I'm looking at these on, so it's hard to find but more importantly
anyone doing a git log through our sources at a later time will be
incredibly hard pressed to find it either. the 0/X is supposed to be a
preamble, not a substitute for patch descriptions. If you plan on
rolling all these patches up with the 0/19 as the description, that's
fine, but I'd have still liked to see the description accompanying the
patch to the list you sent it to.
> > Because if I look at an example:
> >
> > > --- a/drivers/scsi/3w-9xxx.c
> > > +++ b/drivers/scsi/3w-9xxx.c
> > > @@ -2278,14 +2278,10 @@ out_disable_device:
> > >
> > > /* PCI Devices supported by this driver */
> > > static struct pci_device_id twa_pci_tbl[] __devinitdata = {
> > > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9000,
> > > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9550SX,
> > > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9650SE,
> > > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > > - { PCI_VENDOR_ID_3WARE, PCI_DEVICE_ID_3WARE_9690SA,
> > > - PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> > > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9000), 0},
> > > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9550SX), 0},
> > > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9650SE), 0},
> > > + { PCI_VDEVICE(3WARE, PCI_DEVICE_ID_3WARE_9690SA), 0},
> >
> > It appears to take PCI matching on vendor device with any subvendor,
> > device and reproduce the results with a macro, which, for good measure
> > pastes PCI_VENDOR_ID on to the first argument but *doesn't* paste
> > PCI_DEVICE_ID on to the second?
>
> A single macro can't use both a named constant and a magic number
> as the second argument.
>
> Today, only about half of the pci device declarations use
> named constants, mostly defined in pci_ids.h
>
> Style 1: PCI_VDEVICE(VENDOR, PCI_DEVICE_ID_<foo>)
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
> wc -l
> 351
>
> Style 2: PCI_VDEVICE(VENDOR, 0x<hex#>)
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
> wc -l
> 287
>
> PCI_DEVICE(VENDOR, PCI_DEVICE_ID_<foo>)
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_DEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
> wc -l
> 373
>
> PCI_DEVICE(VENDOR, 0x<foo>)
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_DEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
> wc -l
> 320
>
> After this patchset:
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*PCI_DEVICE_ID" * | \
> wc -l
> 831
>
> $ grep -rP --include=*.[ch] \
> "\bPCI_VDEVICE\s*\(\s*\w+\s*,\s*0[xX][0-9a-fA-F]{1,4}" * | \
> wc -l
> 571
>
> > So it transforms a relatively opaque initialiser which most people would
> > have to look up in pci.h into another relatively opaque initialiser
> > indirected via a macro, so now I have to look up both the structure and
> > the macro to figure out what's going on.
> >
> > If that's all it does, I'm having a hard time seeing any actual
> > improvement here.
>
> Greater standardization of declarations across multiple files.
If this applied to all driver files, I might buy it. However, if you
have to match on subvendor/subdevice, you have to write out the whole
thing anyway. PCI_VDEVICE() doesn't even give us the scope to expand
struct pci_device_id because it doesn't (and can't in its current form)
initialise the fields by name.
> Do you have a suggestion or preference for another macro name
> for the named constants uses?
I'm having trouble seeing the actual value of a macro at all. As I said
above, it doesn't seem to be an improvement over the bare initialiser
values. It seems principally designed to save driver writers from
typing ... which is fine, but not really if you apply it after the fact.
It also doesn't seem to have the hallmarks of a true standardisation
because of all the exceptions. All it really does do is deprecate the
bare use of PCI_ANY_ID ... but is that worth all the code churn?
James
On Sat, 2009-06-27 at 15:56 -0500, James Bottomley wrote:
> On Sat, 2009-06-27 at 12:53 -0700, Joe Perches wrote:
> > > If that's all it does, I'm having a hard time seeing any actual
> > > improvement here.
> > Greater standardization of declarations across multiple files.
> If this applied to all driver files, I might buy it.
You might note you're looking at patch 14 of 19 and see
that and guess that it has been applied to all driver files.
> is that worth all the code churn?
I think so.
Joe Perches <[email protected]> writes:
> Signed-off-by: Joe Perches <[email protected]>
> ---
> drivers/net/wan/farsync.c | 21 +++++++--------------
> drivers/net/wan/pc300_drv.c | 12 ++++++------
> drivers/net/wan/pc300too.c | 12 ++++--------
> drivers/net/wan/wanxl.c | 9 +++------
> 4 files changed, 20 insertions(+), 34 deletions(-)
Looks good.
Though I guess I'd delete these now unnecessary empty lines if I were
you:
> +++ b/drivers/net/wan/farsync.c
> @@ -528,26 +528,19 @@ static int fst_debug_mask = { FST_DEBUG };
> * PCI ID lookup table
> */
> static struct pci_device_id fst_pci_dev_id[] __devinitdata = {
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2P, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_T2P},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2P), FST_TYPE_T2P},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4P, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_T4P},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4P), FST_TYPE_T4P},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T1U, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_T1U},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T1U), FST_TYPE_T1U},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T2U, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_T2U},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T2U), FST_TYPE_T2U},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_T4U, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_T4U},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_T4U), FST_TYPE_T4U},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1), FST_TYPE_TE1},
>
> - {PCI_VENDOR_ID_FARSITE, PCI_DEVICE_ID_FARSITE_TE1C, PCI_ANY_ID,
> - PCI_ANY_ID, 0, 0, FST_TYPE_TE1},
> + {PCI_VDEVICE(FARSITE, PCI_DEVICE_ID_FARSITE_TE1C), FST_TYPE_TE1},
> {0,} /* End */
> };
The rest of WAN bits - ack.
--
Krzysztof Halasa
On Thu, Jun 25, 2009 at 07:53:16AM -0700, Joe Perches wrote:
> On Thu, 2009-06-25 at 16:24 +0200, Jiri Slaby wrote:
> > > --- a/drivers/staging/vt6655/device_main.c
> > > +++ b/drivers/staging/vt6655/device_main.c
> > > @@ -344,7 +344,7 @@ static CHIP_INFO chip_info_table[]= {
> > > };
> > >
> > > static struct pci_device_id device_id_table[] __devinitdata = {
> > > -{ 0x1106, 0x3253, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (int)&chip_info_table[0]},
> > > +{ PCI_VDEVICE(VIA, 0x3253), (int)&chip_info_table[0]},
> >
> > Hmm, pointer chopped to 4 bytes on 64-bit. Could you fix that up too?
>
> In addition to original patch
Can you send a new patch with this merged together?
thanks,
greg k-h