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

isdn/hardware/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 c9634ac1

drivers/isdn/hardware/mISDN/hfcpci.c

+46 −46
Original line number Original line Diff line number Diff line
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] = 




static struct pci_device_id hfc_ids[] =

static struct pci_device_id hfc_ids[] =

{

{

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},

		(unsigned long) &hfc_map[0] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},

		(unsigned long) &hfc_map[1] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},

		(unsigned long) &hfc_map[2] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},

		(unsigned long) &hfc_map[3] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},

		(unsigned long) &hfc_map[4] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},

		(unsigned long) &hfc_map[5] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},

		(unsigned long) &hfc_map[6] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},

		(unsigned long) &hfc_map[7] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},

		(unsigned long) &hfc_map[8] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},

		(unsigned long) &hfc_map[9] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},

		(unsigned long) &hfc_map[10] },

	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,

	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},

		(unsigned long) &hfc_map[11] },

	{PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,

	{ PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},

		(unsigned long) &hfc_map[12] },

	{PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,

	{ PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},

		(unsigned long) &hfc_map[13] },

	{PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,

	{ PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},

		(unsigned long) &hfc_map[14] },

	{PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,

	{ PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},

		(unsigned long) &hfc_map[15] },

	{PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,

	{ PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},

		(unsigned long) &hfc_map[16] },

	{PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,

	{ PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},

		(unsigned long) &hfc_map[17] },

	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,

	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},

		(unsigned long) &hfc_map[18] },

	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,

	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},

		(unsigned long) &hfc_map[19] },

	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,

	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},

		(unsigned long) &hfc_map[20] },

	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,

	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},

		(unsigned long) &hfc_map[21] },

	{PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,

	{ PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),

		PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},

		(unsigned long) &hfc_map[22] },

	{},

	{},

};

};