diff options
author | Jon Mason <jdmason@kudzu.us> | 2011-06-27 14:03:44 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-29 15:10:59 -0400 |
commit | f01dce9474e9f09290707b523a134a9605845b00 (patch) | |
tree | 3ad0ddb9ce70fcc03516f4c738a4218f84b0f128 /drivers/net | |
parent | 6a4ecc29c90c322e28941e6dec406b08b5e1f0ea (diff) |
rtlwifi: use PCI_VENDOR_ID_*
Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.c | 8 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/pci.h | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index aa0ba9ec6aa9..532c7d38dae2 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c | |||
@@ -35,10 +35,10 @@ | |||
35 | #include "efuse.h" | 35 | #include "efuse.h" |
36 | 36 | ||
37 | static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = { | 37 | static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = { |
38 | INTEL_VENDOR_ID, | 38 | PCI_VENDOR_ID_INTEL, |
39 | ATI_VENDOR_ID, | 39 | PCI_VENDOR_ID_ATI, |
40 | AMD_VENDOR_ID, | 40 | PCI_VENDOR_ID_AMD, |
41 | SIS_VENDOR_ID | 41 | PCI_VENDOR_ID_SI |
42 | }; | 42 | }; |
43 | 43 | ||
44 | static const u8 ac_to_hwq[] = { | 44 | static const u8 ac_to_hwq[] = { |
diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h index 76f42005a118..a50e5513256e 100644 --- a/drivers/net/wireless/rtlwifi/pci.h +++ b/drivers/net/wireless/rtlwifi/pci.h | |||
@@ -62,12 +62,6 @@ | |||
62 | .subdevice = PCI_ANY_ID,\ | 62 | .subdevice = PCI_ANY_ID,\ |
63 | .driver_data = (kernel_ulong_t)&(cfg) | 63 | .driver_data = (kernel_ulong_t)&(cfg) |
64 | 64 | ||
65 | #define INTEL_VENDOR_ID 0x8086 | ||
66 | #define SIS_VENDOR_ID 0x1039 | ||
67 | #define ATI_VENDOR_ID 0x1002 | ||
68 | #define ATI_DEVICE_ID 0x7914 | ||
69 | #define AMD_VENDOR_ID 0x1022 | ||
70 | |||
71 | #define PCI_MAX_BRIDGE_NUMBER 255 | 65 | #define PCI_MAX_BRIDGE_NUMBER 255 |
72 | #define PCI_MAX_DEVICES 32 | 66 | #define PCI_MAX_DEVICES 32 |
73 | #define PCI_MAX_FUNCTION 8 | 67 | #define PCI_MAX_FUNCTION 8 |