tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ixgb: 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>

authored by

Jon Mason and committed by
David S. Miller 61dc5334 5e80bc78

+8 -12
+3 -2
drivers/net/ethernet/intel/ixgb/ixgb_hw.c
··· 32 32 33 33 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 34 34 35 + #include <linux/pci_ids.h> 35 36 #include "ixgb_hw.h" 36 37 #include "ixgb_ids.h" 37 38 ··· 97 96 ASSERT(!(ctrl_reg & IXGB_CTRL0_RST)); 98 97 #endif 99 98 100 - if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) { 99 + if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) { 101 100 ctrl_reg = /* Enable interrupt from XFP and SerDes */ 102 101 IXGB_CTRL1_GPI0_EN | 103 102 IXGB_CTRL1_SDP6_DIR | ··· 272 271 } 273 272 274 273 /* update phy type for sun specific board */ 275 - if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) 274 + if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) 276 275 phy_type = ixgb_phy_type_bcm; 277 276 278 277 return phy_type;
-5
drivers/net/ethernet/intel/ixgb/ixgb_ids.h
··· 33 33 ** The Device and Vendor IDs for 10 Gigabit MACs 34 34 **********************************************************************/ 35 35 36 - #define INTEL_VENDOR_ID 0x8086 37 - #define INTEL_SUBVENDOR_ID 0x8086 38 - #define SUN_VENDOR_ID 0x108E 39 - #define SUN_SUBVENDOR_ID 0x108E 40 - 41 36 #define IXGB_DEVICE_ID_82597EX 0x1048 42 37 #define IXGB_DEVICE_ID_82597EX_SR 0x1A48 43 38 #define IXGB_DEVICE_ID_82597EX_LR 0x1B48
+5 -5
drivers/net/ethernet/intel/ixgb/ixgb_main.c
··· 54 54 * Class, Class Mask, private data (not used) } 55 55 */ 56 56 static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = { 57 - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, 57 + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX, 58 58 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 59 - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4, 59 + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4, 60 60 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 61 - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, 61 + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_SR, 62 62 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 63 - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR, 63 + {PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_LR, 64 64 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 65 65 66 66 /* required last entry */ ··· 195 195 { 196 196 u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 | 197 197 IXGB_INT_TXDW | IXGB_INT_LSC; 198 - if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID) 198 + if (adapter->hw.subsystem_vendor_id == PCI_VENDOR_ID_SUN) 199 199 val |= IXGB_INT_GPI0; 200 200 IXGB_WRITE_REG(&adapter->hw, IMS, val); 201 201 IXGB_WRITE_FLUSH(&adapter->hw);