Commit d930d1a1 authored by Peter Huewe's avatar Peter Huewe Committed by David S. Miller
Browse files

mISDN: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used)



This patch converts pci_table entries, where .subvendor=PCI_ANY_ID and
.subdevice=PCI_ANY_ID, .class=0 and .class_mask=0, to use the
PCI_VDEVICE macro, and thus improves readability.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8176a3f
Loading
Loading
Loading
Loading
+14 −25
Original line number Diff line number Diff line
@@ -125,36 +125,25 @@ struct inf_hw {
#define PCI_SUB_ID_SEDLBAUER            0x01

static struct pci_device_id infineon_ids[] __devinitdata = {
	{ PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20},
	{ PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA20U},
	{ PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA201},
	{ PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_DIVA202},
	{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20), INF_DIVA20 },
	{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U), INF_DIVA20U },
	{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201), INF_DIVA201 },
	{ PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA202), INF_DIVA202 },
	{ PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
	  PCI_SUBVENDOR_SEDLBAUER_PCI, PCI_SUB_ID_SEDLBAUER, 0, 0,
	  INF_SPEEDWIN },
	{ PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100,
	  PCI_SUBVENDOR_HST_SAPHIR3, PCI_SUB_ID_SEDLBAUER, 0, 0, INF_SAPHIR3 },
	{ PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS1000},
	{ PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_QS3000},
	{ PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_NICCY},
	{ PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_MICROLINK), INF_QS1000 },
	{ PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_QS3000), INF_QS3000 },
	{ PCI_VDEVICE(SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY), INF_NICCY },
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050,
	  PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO, 0, 0,
	  INF_SCT_1 },
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R685},
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
	{ PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_OLITEC,
	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, INF_GAZEL_R753},
	{ PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R685), INF_GAZEL_R685 },
	{ PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R753), INF_GAZEL_R753 },
	{ PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO), INF_GAZEL_R753 },
	{ PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_OLITEC), INF_GAZEL_R753 },
	{ }
};
MODULE_DEVICE_TABLE(pci, infineon_ids);