ixgbe: use PCI_VENDOR_ID_INTEL

Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own
vendor ID #define.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index a3dc9657f572f6d40aa68b64efe52f07babd34fe..2e4523c7ab9e75c9fd4c5f585910d912ced9d20e 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7551,11 +7551,11 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
                }
 
                /* Find the pci device of the offending VF */
-               vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL);
+               vfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL);
                while (vfdev) {
                        if (vfdev->devfn == (req_id & 0xFF))
                                break;
-                       vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID,
+                       vfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                               device_id, vfdev);
                }
                /*

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index d2854434ad12a986868e59f88c6ec2f349aeec62..089468224e7e77c62a701ee47054229b9ca3a39a 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -65,13 +65,13 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter)
        }
 
        vf_devfn = pdev->devfn + 0x80;
-       pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL);
+       pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL);
        while (pvfdev) {
                if (pvfdev->devfn == vf_devfn &&
                    (pvfdev->bus->number >= pdev->bus->number))
                        vfs_found++;
                vf_devfn += 2;
-               pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID,
+               pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                        device_id, pvfdev);
        }
 
@@ -518,11 +518,11 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
                        break;
                }
 
-               pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, device_id, NULL);
+               pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL, device_id, NULL);
                while (pvfdev) {
                        if (pvfdev->devfn == thisvf_devfn)
                                break;
-                       pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID,
+                       pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
                                                device_id, pvfdev);
                }
                if (pvfdev)

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
index 7416d22ec2278bed474ed54e05db93b46060f6a9..a5ceea4d329a0b87d47d4b1d2acbd21a9c4481ba 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
@@ -32,9 +32,6 @@
 #include <linux/mdio.h>
 #include <linux/netdevice.h>
 
-/* Vendor ID */
-#define IXGBE_INTEL_VENDOR_ID   0x8086
-
 /* Device IDs */
 #define IXGBE_DEV_ID_82598               0x10B6
 #define IXGBE_DEV_ID_82598_BX            0x1508