rtlwifi: use PCI_VENDOR_ID_*

Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.

Signed-off-by: Jon Mason <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index aa0ba9ec6aa9601bd4cbbe086e4406cee5a1a36f..532c7d38dae242bfbcb365249e9ef932a06ea9fd 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -35,10 +35,10 @@
 #include "efuse.h"
 
 static const u16 pcibridge_vendors[PCI_BRIDGE_VENDOR_MAX] = {
-       INTEL_VENDOR_ID,
-       ATI_VENDOR_ID,
-       AMD_VENDOR_ID,
-       SIS_VENDOR_ID
+       PCI_VENDOR_ID_INTEL,
+       PCI_VENDOR_ID_ATI,
+       PCI_VENDOR_ID_AMD,
+       PCI_VENDOR_ID_SI
 };
 
 static const u8 ac_to_hwq[] = {

diff --git a/drivers/net/wireless/rtlwifi/pci.h b/drivers/net/wireless/rtlwifi/pci.h
index 76f42005a118902a6a41e7fb1b3092615265fe22..a50e5513256e1d726c2c2a2cdea175fca014bd15 100644 (file)
--- a/drivers/net/wireless/rtlwifi/pci.h
+++ b/drivers/net/wireless/rtlwifi/pci.h
@@ -62,12 +62,6 @@
        .subdevice = PCI_ANY_ID,\
        .driver_data = (kernel_ulong_t)&(cfg)
 
-#define INTEL_VENDOR_ID                                0x8086
-#define SIS_VENDOR_ID                          0x1039
-#define ATI_VENDOR_ID                          0x1002
-#define ATI_DEVICE_ID                          0x7914
-#define AMD_VENDOR_ID                          0x1022
-
 #define PCI_MAX_BRIDGE_NUMBER                  255
 #define PCI_MAX_DEVICES                                32
 #define PCI_MAX_FUNCTION                       8