Commit 36e90319 authored by Jon Mason's avatar Jon Mason Committed by David S. Miller

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: default avatarJon 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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 61dc5334
...@@ -7551,11 +7551,11 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev, ...@@ -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 */ /* 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) { while (vfdev) {
if (vfdev->devfn == (req_id & 0xFF)) if (vfdev->devfn == (req_id & 0xFF))
break; break;
vfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, vfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
device_id, vfdev); device_id, vfdev);
} }
/* /*
......
...@@ -65,13 +65,13 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter) ...@@ -65,13 +65,13 @@ static int ixgbe_find_enabled_vfs(struct ixgbe_adapter *adapter)
} }
vf_devfn = pdev->devfn + 0x80; 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) { while (pvfdev) {
if (pvfdev->devfn == vf_devfn && if (pvfdev->devfn == vf_devfn &&
(pvfdev->bus->number >= pdev->bus->number)) (pvfdev->bus->number >= pdev->bus->number))
vfs_found++; vfs_found++;
vf_devfn += 2; vf_devfn += 2;
pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
device_id, pvfdev); device_id, pvfdev);
} }
...@@ -518,11 +518,11 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask) ...@@ -518,11 +518,11 @@ int ixgbe_vf_configuration(struct pci_dev *pdev, unsigned int event_mask)
break; 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) { while (pvfdev) {
if (pvfdev->devfn == thisvf_devfn) if (pvfdev->devfn == thisvf_devfn)
break; break;
pvfdev = pci_get_device(IXGBE_INTEL_VENDOR_ID, pvfdev = pci_get_device(PCI_VENDOR_ID_INTEL,
device_id, pvfdev); device_id, pvfdev);
} }
if (pvfdev) if (pvfdev)
......
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
#include <linux/mdio.h> #include <linux/mdio.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
/* Vendor ID */
#define IXGBE_INTEL_VENDOR_ID 0x8086
/* Device IDs */ /* Device IDs */
#define IXGBE_DEV_ID_82598 0x10B6 #define IXGBE_DEV_ID_82598 0x10B6
#define IXGBE_DEV_ID_82598_BX 0x1508 #define IXGBE_DEV_ID_82598_BX 0x1508
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment