aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/hisax
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2010-07-15 05:07:30 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-15 22:05:24 -0400
commit8f31539dfa36d8cf880576348d149af0cc1d788a (patch)
tree59d32ef647dace033138a193a2328e854f0eb292 /drivers/isdn/hisax
parent9db9f279be5e663ae0de8b3349f07b38b18e9215 (diff)
isdn/hisax: 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/hisax')
-rw-r--r--drivers/isdn/hisax/config.c84
1 files changed, 42 insertions, 42 deletions
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 544cf4b1cce3..6f9afcd5ca4e 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1909,68 +1909,68 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
1909 1909
1910static struct pci_device_id hisax_pci_tbl[] __devinitdata = { 1910static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
1911#ifdef CONFIG_HISAX_FRITZPCI 1911#ifdef CONFIG_HISAX_FRITZPCI
1912 {PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, PCI_ANY_ID, PCI_ANY_ID}, 1912 {PCI_VDEVICE(AVM, PCI_DEVICE_ID_AVM_A1) },
1913#endif 1913#endif
1914#ifdef CONFIG_HISAX_DIEHLDIVA 1914#ifdef CONFIG_HISAX_DIEHLDIVA
1915 {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, PCI_ANY_ID, PCI_ANY_ID}, 1915 {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20) },
1916 {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, PCI_ANY_ID, PCI_ANY_ID}, 1916 {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA20_U) },
1917 {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, PCI_ANY_ID, PCI_ANY_ID}, 1917 {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA201) },
1918//######################################################################################### 1918/*##########################################################################*/
1919 {PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, PCI_ANY_ID, PCI_ANY_ID}, 1919 {PCI_VDEVICE(EICON, PCI_DEVICE_ID_EICON_DIVA202) },
1920//######################################################################################### 1920/*##########################################################################*/
1921#endif 1921#endif
1922#ifdef CONFIG_HISAX_ELSA 1922#ifdef CONFIG_HISAX_ELSA
1923 {PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, PCI_ANY_ID, PCI_ANY_ID}, 1923 {PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_MICROLINK) },
1924 {PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000, PCI_ANY_ID, PCI_ANY_ID}, 1924 {PCI_VDEVICE(ELSA, PCI_DEVICE_ID_ELSA_QS3000) },
1925#endif 1925#endif
1926#ifdef CONFIG_HISAX_GAZEL 1926#ifdef CONFIG_HISAX_GAZEL
1927 {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R685, PCI_ANY_ID, PCI_ANY_ID}, 1927 {PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R685) },
1928 {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_R753, PCI_ANY_ID, PCI_ANY_ID}, 1928 {PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_R753) },
1929 {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO, PCI_ANY_ID, PCI_ANY_ID}, 1929 {PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_DJINN_ITOO) },
1930 {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_OLITEC, PCI_ANY_ID, PCI_ANY_ID}, 1930 {PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_OLITEC) },
1931#endif 1931#endif
1932#ifdef CONFIG_HISAX_SCT_QUADRO 1932#ifdef CONFIG_HISAX_SCT_QUADRO
1933 {PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, PCI_ANY_ID, PCI_ANY_ID}, 1933 {PCI_VDEVICE(PLX, PCI_DEVICE_ID_PLX_9050) },
1934#endif 1934#endif
1935#ifdef CONFIG_HISAX_NICCY 1935#ifdef CONFIG_HISAX_NICCY
1936 {PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY, PCI_ANY_ID,PCI_ANY_ID}, 1936 {PCI_VDEVICE(SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY) },
1937#endif 1937#endif
1938#ifdef CONFIG_HISAX_SEDLBAUER 1938#ifdef CONFIG_HISAX_SEDLBAUER
1939 {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, PCI_ANY_ID,PCI_ANY_ID}, 1939 {PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_100) },
1940#endif 1940#endif
1941#if defined(CONFIG_HISAX_NETJET) || defined(CONFIG_HISAX_NETJET_U) 1941#if defined(CONFIG_HISAX_NETJET) || defined(CONFIG_HISAX_NETJET_U)
1942 {PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, PCI_ANY_ID,PCI_ANY_ID}, 1942 {PCI_VDEVICE(TIGERJET, PCI_DEVICE_ID_TIGERJET_300) },
1943#endif 1943#endif
1944#if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO) 1944#if defined(CONFIG_HISAX_TELESPCI) || defined(CONFIG_HISAX_SCT_QUADRO)
1945 {PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, PCI_ANY_ID,PCI_ANY_ID}, 1945 {PCI_VDEVICE(ZORAN, PCI_DEVICE_ID_ZORAN_36120) },
1946#endif 1946#endif
1947#ifdef CONFIG_HISAX_W6692 1947#ifdef CONFIG_HISAX_W6692
1948 {PCI_VENDOR_ID_DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH, PCI_ANY_ID,PCI_ANY_ID}, 1948 {PCI_VDEVICE(DYNALINK, PCI_DEVICE_ID_DYNALINK_IS64PH) },
1949 {PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_6692, PCI_ANY_ID,PCI_ANY_ID}, 1949 {PCI_VDEVICE(WINBOND2, PCI_DEVICE_ID_WINBOND2_6692) },
1950#endif 1950#endif
1951#ifdef CONFIG_HISAX_HFC_PCI 1951#ifdef CONFIG_HISAX_HFC_PCI
1952 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0, PCI_ANY_ID, PCI_ANY_ID}, 1952 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_2BD0) },
1953 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B000, PCI_ANY_ID, PCI_ANY_ID}, 1953 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B000) },
1954 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B006, PCI_ANY_ID, PCI_ANY_ID}, 1954 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B006) },
1955 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B007, PCI_ANY_ID, PCI_ANY_ID}, 1955 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B007) },
1956 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B008, PCI_ANY_ID, PCI_ANY_ID}, 1956 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B008) },
1957 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B009, PCI_ANY_ID, PCI_ANY_ID}, 1957 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B009) },
1958 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00A, PCI_ANY_ID, PCI_ANY_ID}, 1958 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00A) },
1959 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00B, PCI_ANY_ID, PCI_ANY_ID}, 1959 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00B) },
1960 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B00C, PCI_ANY_ID, PCI_ANY_ID}, 1960 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B00C) },
1961 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B100, PCI_ANY_ID, PCI_ANY_ID}, 1961 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B100) },
1962 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B700, PCI_ANY_ID, PCI_ANY_ID}, 1962 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B700) },
1963 {PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_B701, PCI_ANY_ID, PCI_ANY_ID}, 1963 {PCI_VDEVICE(CCD, PCI_DEVICE_ID_CCD_B701) },
1964 {PCI_VENDOR_ID_ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1, PCI_ANY_ID, PCI_ANY_ID}, 1964 {PCI_VDEVICE(ABOCOM, PCI_DEVICE_ID_ABOCOM_2BD1) },
1965 {PCI_VENDOR_ID_ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675, PCI_ANY_ID, PCI_ANY_ID}, 1965 {PCI_VDEVICE(ASUSTEK, PCI_DEVICE_ID_ASUSTEK_0675) },
1966 {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT, PCI_ANY_ID, PCI_ANY_ID}, 1966 {PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_T_CONCEPT) },
1967 {PCI_VENDOR_ID_BERKOM, PCI_DEVICE_ID_BERKOM_A1T, PCI_ANY_ID, PCI_ANY_ID}, 1967 {PCI_VDEVICE(BERKOM, PCI_DEVICE_ID_BERKOM_A1T) },
1968 {PCI_VENDOR_ID_ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575, PCI_ANY_ID, PCI_ANY_ID}, 1968 {PCI_VDEVICE(ANIGMA, PCI_DEVICE_ID_ANIGMA_MC145575) },
1969 {PCI_VENDOR_ID_ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0, PCI_ANY_ID, PCI_ANY_ID}, 1969 {PCI_VDEVICE(ZOLTRIX, PCI_DEVICE_ID_ZOLTRIX_2BD0) },
1970 {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E, PCI_ANY_ID, PCI_ANY_ID}, 1970 {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_E) },
1971 {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_E, PCI_ANY_ID, PCI_ANY_ID}, 1971 {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_E) },
1972 {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A, PCI_ANY_ID, PCI_ANY_ID}, 1972 {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_IOM2_A) },
1973 {PCI_VENDOR_ID_DIGI, PCI_DEVICE_ID_DIGI_DF_M_A, PCI_ANY_ID, PCI_ANY_ID}, 1973 {PCI_VDEVICE(DIGI, PCI_DEVICE_ID_DIGI_DF_M_A) },
1974#endif 1974#endif
1975 { } /* Terminating entry */ 1975 { } /* Terminating entry */
1976}; 1976};
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-04 21:10:44 -0500