From: Alan Cox Date: Thu, 6 Aug 2009 19:44:37 +0000 (+0100) Subject: Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names X-Git-Tag: v2.6.32-rc1~668^2~221 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4dd00845690a6744dbd879fa49584c49098823d8;p=profile%2Fivi%2Fkernel-x86-ivi.git Staging: rar/sep: Don't use random VENDOR_ID macros but the proper names Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- 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 #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 } };