[PATCH 420/641] Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names

[Greg Kroah-Hartman]

From: Alan Cox <alan at linux.intel.com>

Signed-off-by: Alan Cox <alan at linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/rar/rar_driver.c              |    8 +-------
 drivers/staging/sep/sep_ext_with_pci_driver.c |    4 +---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rar/rar_driver.c b/drivers/staging/rar/rar_driver.c
index 0428bce..9805d74 100644
--- a/drivers/staging/rar/rar_driver.c
+++ b/drivers/staging/rar/rar_driver.c
@@ -17,12 +17,6 @@
 #include <linux/sched.h>
 #include "rar_driver.h"
 
-/* PCI vendor id for controler */
-#define VENDOR_ID 0x8086
-
-/* PCI device id for controler */
-#define DEVICE_ID 0x4110
-
 /* The following defines are for the IPC process to retrieve RAR in */
 
 /* === Lincroft Message Bus Interface === */
@@ -77,7 +71,7 @@ static void __exit rar_exit_handler(void);
 static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 
 static struct pci_device_id rar_pci_id_tbl[] = {
-	{ PCI_DEVICE(VENDOR_ID, DEVICE_ID) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4110) },
 	{ 0 }
 };
 
diff --git a/drivers/staging/sep/sep_ext_with_pci_driver.c b/drivers/staging/sep/sep_ext_with_pci_driver.c
index 49465f2..bac0dd0 100644
--- a/drivers/staging/sep/sep_ext_with_pci_driver.c
+++ b/drivers/staging/sep/sep_ext_with_pci_driver.c
@@ -91,8 +91,6 @@ static unsigned long CRYS_SEP_ROM[] = {
 
 irqreturn_t sep_inthandler(int irq , void* dev_id);
 
-/* NOTE - must be defined specific to the board */
-#define VENDOR_ID                             0x8086
 
 /* io memory (register area) */
 static unsigned long io_memory_start_physical_address;
@@ -134,7 +132,7 @@ static int __devinit sep_probe(struct pci_dev *pdev,
   const struct pci_device_id *ent);
 
 static struct pci_device_id sep_pci_id_tbl[] = {
-	{ PCI_DEVICE(VENDOR_ID, 0x080c) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080c) },
 	{ 0 }
 };
 
-- 
1.6.4.2