| Message ID | 1342767729-17788-3-git-send-email-jdmason@kudzu.us |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: > 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> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- > 3 files changed, 6 insertions(+), 9 deletions(-) Same goes for this patch as well (not being trivial). I already have several patches submitted for Dave against ixgbe currently and I am not sure if there would be any issues with this patch applying on top of the currently submitted patches. I will verify this applies cleanly with no issue to my current net-next tree before I send my ACK.
On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: > 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> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- > drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- > 3 files changed, 6 insertions(+), 9 deletions(-) This applies cleanly against my current net-next tree and looks fine. Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Fri, 20 Jul 2012 00:17:09 -0700 > On Fri, 2012-07-20 at 00:02 -0700, Jon Mason wrote: >> 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> ... > Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 18ca3bc..8a3fafb 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7516,11 +7516,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 2d971d1..28018d4 100644 --- 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); } @@ -488,11 +488,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 204848d..c8d8040 100644 --- 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
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> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 8 ++++---- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 3 --- 3 files changed, 6 insertions(+), 9 deletions(-)