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

isdn/hardware/eicon: 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 d930d1a1

drivers/isdn/hardware/eicon/divasmain.c

+34 −35
Original line number Diff line number Diff line
@@ -113,39 +113,38 @@ 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,

	{ 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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE