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: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
author: Peter Huewe <peterhuewe@gmx.de> 2010-07-15 05:02:36 -0400
committer: David S. Miller <davem@davemloft.net> 2010-07-15 22:05:22 -0400
commit: b8176a3f7a4e54a3338535e8c6086713d1c0b804 (patch)
tree: ea1fca5c648f3e8491773a538fe99f32e82c4bbd
parent: c9634ac1b79bf7b26ceabff16c1fd36943cf5511 (diff)
1 files changed, 46 insertions, 46 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 5940a2c1207..10757abac0b 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] =
 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] },
        {},
 };
author	Peter Huewe <peterhuewe@gmx.de>	2010-07-15 05:02:36 -0400
committer	David S. Miller <davem@davemloft.net>	2010-07-15 22:05:22 -0400
commit	b8176a3f7a4e54a3338535e8c6086713d1c0b804 (patch)
tree	ea1fca5c648f3e8491773a538fe99f32e82c4bbd
parent	c9634ac1b79bf7b26ceabff16c1fd36943cf5511 (diff)

diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 5940a2c1207..10757abac0b 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -2188,52 +2188,52 @@ static const struct _hfc_map hfc_map[] =
2188		2188
2189	static struct pci_device_id hfc_ids[] =	2189	static struct pci_device_id hfc_ids[] =
2190	{	2190	{
2191	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,	2191	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0),
2192	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[0]},	2192	(unsigned long) &hfc_map[0] },
2193	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000,	2193	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000),
2194	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[1]},	2194	(unsigned long) &hfc_map[1] },
2195	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006,	2195	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006),
2196	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[2]},	2196	(unsigned long) &hfc_map[2] },
2197	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007,	2197	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007),
2198	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[3]},	2198	(unsigned long) &hfc_map[3] },
2199	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008,	2199	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008),
2200	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[4]},	2200	(unsigned long) &hfc_map[4] },
2201	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009,	2201	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009),
2202	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[5]},	2202	(unsigned long) &hfc_map[5] },
2203	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A,	2203	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A),
2204	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[6]},	2204	(unsigned long) &hfc_map[6] },
2205	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B,	2205	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B),
2206	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[7]},	2206	(unsigned long) &hfc_map[7] },
2207	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C,	2207	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C),
2208	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[8]},	2208	(unsigned long) &hfc_map[8] },
2209	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100,	2209	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100),
2210	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[9]},	2210	(unsigned long) &hfc_map[9] },
2211	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700,	2211	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700),
2212	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[10]},	2212	(unsigned long) &hfc_map[10] },
2213	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701,	2213	{ PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701),
2214	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[11]},	2214	(unsigned long) &hfc_map[11] },
2215	{PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1,	2215	{ PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1),
2216	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[12]},	2216	(unsigned long) &hfc_map[12] },
2217	{PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675,	2217	{ PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675),
2218	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[13]},	2218	(unsigned long) &hfc_map[13] },
2219	{PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT,	2219	{ PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT),
2220	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[14]},	2220	(unsigned long) &hfc_map[14] },
2221	{PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T,	2221	{ PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T),
2222	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[15]},	2222	(unsigned long) &hfc_map[15] },
2223	{PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575,	2223	{ PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575),
2224	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[16]},	2224	(unsigned long) &hfc_map[16] },
2225	{PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0,	2225	{ PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0),
2226	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[17]},	2226	(unsigned long) &hfc_map[17] },
2227	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E,	2227	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E),
2228	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[18]},	2228	(unsigned long) &hfc_map[18] },
2229	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E,	2229	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E),
2230	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[19]},	2230	(unsigned long) &hfc_map[19] },
2231	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A,	2231	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A),
2232	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[20]},	2232	(unsigned long) &hfc_map[20] },
2233	{PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A,	2233	{ PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A),
2234	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[21]},	2234	(unsigned long) &hfc_map[21] },
2235	{PCI_VENDOR_ID_SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2,	2235	{ PCI_VDEVICE(SITECOM, PCI_DEVICE_ID_SITECOM_DC105V2),
2236	PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long) &hfc_map[22]},	2236	(unsigned long) &hfc_map[22] },
2237	{},	2237	{},
2238	};	2238	};
2239		2239