PCI: ATM: lanai, change VENDOR to DEVICE

lanai, change VENDOR to DEVICE

There were 2 bad named macros in pci_ids (LANAI 2 and IHB). Rename it to
DEVICE, because it's device id. Also make some cleanpu in pci_device_id
table (use PCI_VDEVICE).

Cc: Mitchell Blank Jr <mitch@sfgoth.com>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index 203c70378b15..0e2c1ae650e7 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -246,8 +246,8 @@ struct lanai_vcc {
 };
 
 enum lanai_type {
-        lanai2  = PCI_VENDOR_ID_EF_ATM_LANAI2,
-        lanaihb = PCI_VENDOR_ID_EF_ATM_LANAIHB
+        lanai2  = PCI_DEVICE_ID_EF_ATM_LANAI2,
+        lanaihb = PCI_DEVICE_ID_EF_ATM_LANAIHB
 };
 
 struct lanai_dev_stats {
@@ -2622,14 +2622,8 @@ static int __devinit lanai_init_one(struct pci_dev *pci,
 }
 
 static struct pci_device_id lanai_pci_tbl[] = {
-        {
-                PCI_VENDOR_ID_EF, PCI_VENDOR_ID_EF_ATM_LANAI2,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0
-        },
-        {
-                PCI_VENDOR_ID_EF, PCI_VENDOR_ID_EF_ATM_LANAIHB,
-                PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0
-        },
+        { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAI2) },
+        { PCI_VDEVICE(EF, PCI_DEVICE_ID_EF_ATM_LANAIHB) },
         { 0, }  /* terminal entry */
 };
 MODULE_DEVICE_TABLE(pci, lanai_pci_tbl);