diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2011-11-27 09:13:51 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-27 14:24:32 -0500 |
commit | 5fef30b28295890bb5d16f41ab32886f6f3c99ee (patch) | |
tree | 7fab27ec634800f12ca9c17d0ee6b9fdeb114ba4 /drivers/staging/wlags49_h2/wl_pci.c | |
parent | dcbc2fc62cb60a76161fb08737ea7165e05da111 (diff) |
staging/wlags49_h2: Convert pci_table entries to PCI_DEVICE (if PCI_ANY_ID is used)
This patch converts pci_table entries to use the PCI_DEVICE macro,
if .subvendor and .subdevice are set to PCI_ANY_ID,
and thus improves readablity.
Since CH_Agere_Systems_Mini_PCI_V1 is defined as 0 in hermes_pci_versions
and neither the enum nor the value is used anywhere else, we can drop
the assignment of .driver_data as it is initialized as 0 by default.
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_pci.c')
-rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 28ae9dd1b44..30456ed7d23 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c | |||
@@ -112,17 +112,10 @@ extern dbg_info_t *DbgInfo; | |||
112 | #endif // DBG | 112 | #endif // DBG |
113 | 113 | ||
114 | /* define the PCI device Table Cardname and id tables */ | 114 | /* define the PCI device Table Cardname and id tables */ |
115 | enum hermes_pci_versions { | ||
116 | CH_Agere_Systems_Mini_PCI_V1 = 0, | ||
117 | }; | ||
118 | |||
119 | static struct pci_device_id wl_pci_tbl[] __devinitdata = { | 115 | static struct pci_device_id wl_pci_tbl[] __devinitdata = { |
120 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0, | 116 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0), }, |
121 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | 117 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1), }, |
122 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1, | 118 | { PCI_DEVICE(PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2), }, |
123 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | ||
124 | { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2, | ||
125 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, | ||
126 | 119 | ||
127 | { } /* Terminating entry */ | 120 | { } /* Terminating entry */ |
128 | }; | 121 | }; |