diff options
| author | Peter Huewe <peterhuewe@gmx.de> | 2010-07-15 05:04:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-15 22:05:23 -0400 |
| commit | f51307e4aaa1dc233ec852360ea22a2d96ec66dc (patch) | |
| tree | 7d8343dc0e5ec7956e01a2916f73d468f57b75bb /drivers/isdn/hardware | |
| parent | d930d1a142af07f25c5cbf33aeea6ebbd25315ce (diff) | |
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: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/hardware')
| -rw-r--r-- | drivers/isdn/hardware/eicon/divasmain.c | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c index 16a874bb1561..ed9c55506797 100644 --- a/drivers/isdn/hardware/eicon/divasmain.c +++ b/drivers/isdn/hardware/eicon/divasmain.c | |||
| @@ -112,41 +112,40 @@ typedef struct _diva_os_thread_dpc { | |||
| 112 | This table should be sorted by PCI device ID | 112 | This table should be sorted by PCI device ID |
| 113 | */ | 113 | */ |
| 114 | static struct pci_device_id divas_pci_tbl[] = { | 114 | static struct pci_device_id divas_pci_tbl[] = { |
| 115 | /* Diva Server BRI-2M PCI 0xE010 */ | 115 | /* Diva Server BRI-2M PCI 0xE010 */ |
| 116 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRA, | 116 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRA), |
| 117 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_MAESTRA_PCI}, | 117 | CARDTYPE_MAESTRA_PCI }, |
| 118 | /* Diva Server 4BRI-8M PCI 0xE012 */ | 118 | /* Diva Server 4BRI-8M PCI 0xE012 */ |
| 119 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ, | 119 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ), |
| 120 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_PCI}, | 120 | CARDTYPE_DIVASRV_Q_8M_PCI }, |
| 121 | /* Diva Server 4BRI-8M 2.0 PCI 0xE013 */ | 121 | /* Diva Server 4BRI-8M 2.0 PCI 0xE013 */ |
| 122 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U, | 122 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAQ_U), |
| 123 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_Q_8M_V2_PCI}, | 123 | CARDTYPE_DIVASRV_Q_8M_V2_PCI }, |
| 124 | /* Diva Server PRI-30M PCI 0xE014 */ | 124 | /* Diva Server PRI-30M PCI 0xE014 */ |
| 125 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP, | 125 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP), |
| 126 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_PCI}, | 126 | CARDTYPE_DIVASRV_P_30M_PCI }, |
| 127 | /* Diva Server PRI 2.0 adapter 0xE015 */ | 127 | /* Diva Server PRI 2.0 adapter 0xE015 */ |
| 128 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2, | 128 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2), |
| 129 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_P_30M_V2_PCI}, | 129 | CARDTYPE_DIVASRV_P_30M_V2_PCI }, |
| 130 | /* Diva Server Voice 4BRI-8M PCI 0xE016 */ | 130 | /* Diva Server Voice 4BRI-8M PCI 0xE016 */ |
| 131 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP, | 131 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_VOIP), |
| 132 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_PCI}, | 132 | CARDTYPE_DIVASRV_VOICE_Q_8M_PCI }, |
| 133 | /* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */ | 133 | /* Diva Server Voice 4BRI-8M 2.0 PCI 0xE017 */ |
| 134 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP, | 134 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_4BRI_2_VOIP), |
| 135 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI}, | 135 | CARDTYPE_DIVASRV_VOICE_Q_8M_V2_PCI }, |
| 136 | /* Diva Server BRI-2M 2.0 PCI 0xE018 */ | 136 | /* Diva Server BRI-2M 2.0 PCI 0xE018 */ |
| 137 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2, | 137 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2), |
| 138 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2M_V2_PCI}, | 138 | CARDTYPE_DIVASRV_B_2M_V2_PCI }, |
| 139 | /* Diva Server Voice PRI 2.0 PCI 0xE019 */ | 139 | /* Diva Server Voice PRI 2.0 PCI 0xE019 */ |
| 140 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP, | 140 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_MAESTRAP_2_VOIP), |
| 141 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, | 141 | CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI }, |
| 142 | CARDTYPE_DIVASRV_VOICE_P_30M_V2_PCI}, | 142 | /* Diva Server 2FX 0xE01A */ |
| 143 | /* Diva Server 2FX 0xE01A */ | 143 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_2F), |
| 144 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_2F, | 144 | CARDTYPE_DIVASRV_B_2F_PCI }, |
| 145 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_B_2F_PCI}, | 145 | /* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */ |
| 146 | /* Diva Server Voice BRI-2M 2.0 PCI 0xE01B */ | 146 | { PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP), |
| 147 | {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_BRI2M_2_VOIP, | 147 | CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI }, |
| 148 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CARDTYPE_DIVASRV_VOICE_B_2M_V2_PCI}, | 148 | { 0, } /* 0 terminated list. */ |
| 149 | {0,} /* 0 terminated list. */ | ||
| 150 | }; | 149 | }; |
| 151 | MODULE_DEVICE_TABLE(pci, divas_pci_tbl); | 150 | MODULE_DEVICE_TABLE(pci, divas_pci_tbl); |
| 152 | 151 | ||