[trivial PATCH 1/7] ixgb: use PCI_VENDOR_ID_*

[trivial PATCH 1/7] ixgb: use PCI_VENDOR_ID_*

[Jon Mason]

Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.

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/ixgb/ixgb_hw.c   |    5 +++--
 drivers/net/ethernet/intel/ixgb/ixgb_ids.h  |    5 -----
 drivers/net/ethernet/intel/ixgb/ixgb_main.c |   10 +++++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
index 99b69ad..bf9a220 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
@@ -32,6 +32,7 @@
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/pci_ids.h>
 #include "ixgb_hw.h"
 #include "ixgb_ids.h"
 
@@ -96,7 +97,7 @@ static u32 ixgb_mac_reset(struct ixgb_hw *hw)
 	ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
 #endif
 
-	if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
+	if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) {
 		ctrl_reg =  /* Enable interrupt from XFP and SerDes */
 			   IXGB_CTRL1_GPI0_EN |
 			   IXGB_CTRL1_SDP6_DIR |
@@ -271,7 +272,7 @@ ixgb_identify_phy(struct ixgb_hw *hw)
 	}
 
 	/* update phy type for sun specific board */
-	if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
+	if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN)
 		phy_type = ixgb_phy_type_bcm;
 
 	return phy_type;
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
index 2a58847..32c1b30 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
@@ -33,11 +33,6 @@
 ** The Device and Vendor IDs for 10 Gigabit MACs
 **********************************************************************/
 
-#define INTEL_VENDOR_ID             0x8086
-#define INTEL_SUBVENDOR_ID          0x8086
-#define SUN_VENDOR_ID               0x108E
-#define SUN_SUBVENDOR_ID            0x108E
-
 #define IXGB_DEVICE_ID_82597EX      0x1048
 #define IXGB_DEVICE_ID_82597EX_SR   0x1A48
 #define IXGB_DEVICE_ID_82597EX_LR   0x1B48
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index 5fce363..4e5a060 100644
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@ -54,13 +54,13 @@ MODULE_PARM_DESC(copybreak,
  *   Class, Class Mask, private data (not used) }
  */
 static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = {
-	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
+	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
+	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
+	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_SR,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
+	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_LR,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 
 	/* required last entry */
@@ -195,7 +195,7 @@ ixgb_irq_enable(struct ixgb_adapter *adapter)
 {
 	u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
 		  IXGB_INT_TXDW | IXGB_INT_LSC;
-	if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
+	if (adapter->hw.subsystem_vendor_id == PCI_VENDOR_ID_SUN)
 		val |= IXGB_INT_GPI0;
 	IXGB_WRITE_REG(&adapter->hw, IMS, val);
 	IXGB_WRITE_FLUSH(&adapter->hw);
-- 
1.7.9.5

[trivial PATCH 2/7] ixgbe: remove unused #define

[Jon Mason]

Remove unused IXGBE_INTEL_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_type.h |    3 ---
 1 file changed, 3 deletions(-)

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
-- 
1.7.9.5

[trivial PATCH 3/7] megaraid: remove unnecessary #defines

[Jon Mason]

Remove PCI vendor and subvendor IDs, as they are already defined in
pci_ids.h.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 drivers/scsi/megaraid.c |    5 ++---
 drivers/scsi/megaraid.h |   35 -----------------------------------
 2 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 4d39a9f..f066ec4 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -305,12 +305,11 @@ mega_query_adapter(adapter_t *adapter)
 
 	adapter->host->sg_tablesize = adapter->sglen;
 
-
 	/* use HP firmware and bios version encoding
 	   Note: fw_version[0|1] and bios_version[0|1] were originally shifted
 	   right 8 bits making them zero. This 0 value was hardcoded to fix
 	   sparse warnings. */
-	if (adapter->product_info.subsysvid == HP_SUBSYS_VID) {
+	if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) {
 		sprintf (adapter->fw_version, "%c%d%d.%d%d",
 			 adapter->product_info.fw_version[2],
 			 0,
@@ -4716,7 +4715,7 @@ megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
 	 * support, since this firmware cannot handle 64 bit
 	 * addressing
 	 */
-	if ((subsysvid == HP_SUBSYS_VID) &&
+	if ((subsysvid == PCI_VENDOR_ID_HP) &&
 	    ((subsysid == 0x60E7) || (subsysid == 0x60E8))) {
 		/*
 		 * which firmware
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 9a7897f..4fb2adf 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -45,45 +45,10 @@
 
 #define MAX_DEV_TYPE	32
 
-#ifndef PCI_VENDOR_ID_LSI_LOGIC
-#define PCI_VENDOR_ID_LSI_LOGIC		0x1000
-#endif
-
-#ifndef PCI_VENDOR_ID_AMI
-#define PCI_VENDOR_ID_AMI		0x101E
-#endif
-
-#ifndef PCI_VENDOR_ID_DELL
-#define PCI_VENDOR_ID_DELL		0x1028
-#endif
-
-#ifndef PCI_VENDOR_ID_INTEL
-#define PCI_VENDOR_ID_INTEL		0x8086
-#endif
-
-#ifndef PCI_DEVICE_ID_AMI_MEGARAID
-#define PCI_DEVICE_ID_AMI_MEGARAID	0x9010
-#endif
-
-#ifndef PCI_DEVICE_ID_AMI_MEGARAID2
-#define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060
-#endif
-
-#ifndef PCI_DEVICE_ID_AMI_MEGARAID3
-#define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960
-#endif
-
 #define PCI_DEVICE_ID_DISCOVERY		0x000E
 #define PCI_DEVICE_ID_PERC4_DI		0x000F
 #define PCI_DEVICE_ID_PERC4_QC_VERDE	0x0407
 
-/* Sub-System Vendor IDs */
-#define	AMI_SUBSYS_VID			0x101E
-#define DELL_SUBSYS_VID			0x1028
-#define	HP_SUBSYS_VID			0x103C
-#define LSI_SUBSYS_VID			0x1000
-#define INTEL_SUBSYS_VID		0x8086
-
 #define HBA_SIGNATURE	      		0x3344
 #define HBA_SIGNATURE_471	  	0xCCCC
 #define HBA_SIGNATURE_64BIT		0x0299
-- 
1.7.9.5

[trivial PATCH 4/7] gdt: remove unnecessary #defines

[Jon Mason]

Remove PCI vendor IDs, as they are already defined in pci_ids.h.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Achim Leubner <achim_leubner@adaptec.com>
---
 drivers/scsi/gdth.h |    9 ---------
 1 file changed, 9 deletions(-)

diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index d3e4d7c..fbf6f0f 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -49,15 +49,6 @@
 /* GDT_ISA */
 #define GDT2_ID         0x0120941c              /* GDT2000/2020 */
 
-/* vendor ID, device IDs (PCI) */
-/* these defines should already exist in <linux/pci.h> */
-#ifndef PCI_VENDOR_ID_VORTEX
-#define PCI_VENDOR_ID_VORTEX            0x1119  /* PCI controller vendor ID */
-#endif
-#ifndef PCI_VENDOR_ID_INTEL
-#define PCI_VENDOR_ID_INTEL             0x8086  
-#endif
-
 #ifndef PCI_DEVICE_ID_VORTEX_GDT60x0
 /* GDT_PCI */
 #define PCI_DEVICE_ID_VORTEX_GDT60x0    0       /* GDT6000/6020/6050 */
-- 
1.7.9.5

[trivial PATCH 5/7] hpet: Remove unused PCI Vendor ID #define

[Jon Mason]

HPET_ID_VENDOR_8086 is defined but never used.  It would be a redefine
of PCI_VENDOR_ID_INTEL if it was ever used.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 arch/x86/include/asm/hpet.h |    2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h
index 2c392d6..434e210 100644
--- a/arch/x86/include/asm/hpet.h
+++ b/arch/x86/include/asm/hpet.h
@@ -35,8 +35,6 @@
 #define	HPET_ID_NUMBER_SHIFT	8
 #define HPET_ID_VENDOR_SHIFT	16
 
-#define HPET_ID_VENDOR_8086	0x8086
-
 #define HPET_CFG_ENABLE		0x001
 #define HPET_CFG_LEGACY		0x002
 #define	HPET_LEGACY_8254	2
-- 
1.7.9.5

[trivial PATCH 6/7] dt3155v4l: use PCI_VENDOR_ID_INTEL

[Jon Mason]

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

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/staging/media/dt3155v4l/dt3155v4l.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/media/dt3155v4l/dt3155v4l.c b/drivers/staging/media/dt3155v4l/dt3155v4l.c
index c365cdf..76faa85 100644
--- a/drivers/staging/media/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/media/dt3155v4l/dt3155v4l.c
@@ -30,7 +30,6 @@
 
 #include "dt3155v4l.h"
 
-#define DT3155_VENDOR_ID 0x8086
 #define DT3155_DEVICE_ID 0x1223
 
 /* DT3155_CHUNK_SIZE is 4M (2^22) 8 full size buffers */
@@ -959,7 +958,7 @@ dt3155_remove(struct pci_dev *pdev)
 }
 
 static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
-	{ PCI_DEVICE(DT3155_VENDOR_ID, DT3155_DEVICE_ID) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, DT3155_DEVICE_ID) },
 	{ 0, /* zero marks the end */ },
 };
 MODULE_DEVICE_TABLE(pci, pci_ids);
-- 
1.7.9.5

[trivial PATCH 7/7] ioat: remove unused #defines

[Jon Mason]

IOAT has a redefine of PCI Vendor, PCI Subvendor, etc for
PCI_VENDOR_ID_INTEL but they are never used.  Remove them.

Signed-off-by: Jon Mason <jdmason@kudzu.us>
Cc: Dan Williams <dan.j.williams@intel.com>
---
 drivers/dma/ioat/hw.h |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/drivers/dma/ioat/hw.h b/drivers/dma/ioat/hw.h
index 60e6754..d2ff3fd 100644
--- a/drivers/dma/ioat/hw.h
+++ b/drivers/dma/ioat/hw.h
@@ -22,7 +22,6 @@
 #define _IOAT_HW_H_
 
 /* PCI Configuration Space Values */
-#define IOAT_PCI_VID            0x8086
 #define IOAT_MMIO_BAR		0
 
 /* CB device ID's */
@@ -31,9 +30,6 @@
 #define IOAT_PCI_DID_SCNB       0x65FF
 #define IOAT_PCI_DID_SNB        0x402F
 
-#define IOAT_PCI_RID            0x00
-#define IOAT_PCI_SVID           0x8086
-#define IOAT_PCI_SID            0x8086
 #define IOAT_VER_1_2            0x12    /* Version 1.2 */
 #define IOAT_VER_2_0            0x20    /* Version 2.0 */
 #define IOAT_VER_3_0            0x30    /* Version 3.0 */
-- 
1.7.9.5

Re: [trivial PATCH 1/7] ixgb: use PCI_VENDOR_ID_*

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 4241 bytes --]

On Tue, 2012-07-10 at 15:31 -0700, Jon Mason wrote:
> Use PCI_VENDOR_ID_* from pci_ids.h instead of creating #define locally.
> 
> 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/ixgb/ixgb_hw.c   |    5 +++--
>  drivers/net/ethernet/intel/ixgb/ixgb_ids.h  |    5 -----
>  drivers/net/ethernet/intel/ixgb/ixgb_main.c |   10 +++++-----
>  3 files changed, 8 insertions(+), 12 deletions(-)

This should go through David Miller's networking tree's.  Adding netdev
mailing list.

Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

> 
> diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
> index 99b69ad..bf9a220 100644
> --- a/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
> +++ b/drivers/net/ethernet/intel/ixgb/ixgb_hw.c
> @@ -32,6 +32,7 @@
>  
>  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>  
> +#include <linux/pci_ids.h>
>  #include "ixgb_hw.h"
>  #include "ixgb_ids.h"
>  
> @@ -96,7 +97,7 @@ static u32 ixgb_mac_reset(struct ixgb_hw *hw)
>  	ASSERT(!(ctrl_reg & IXGB_CTRL0_RST));
>  #endif
>  
> -	if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID) {
> +	if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN) {
>  		ctrl_reg =  /* Enable interrupt from XFP and SerDes */
>  			   IXGB_CTRL1_GPI0_EN |
>  			   IXGB_CTRL1_SDP6_DIR |
> @@ -271,7 +272,7 @@ ixgb_identify_phy(struct ixgb_hw *hw)
>  	}
>  
>  	/* update phy type for sun specific board */
> -	if (hw->subsystem_vendor_id == SUN_SUBVENDOR_ID)
> +	if (hw->subsystem_vendor_id == PCI_VENDOR_ID_SUN)
>  		phy_type = ixgb_phy_type_bcm;
>  
>  	return phy_type;
> diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
> index 2a58847..32c1b30 100644
> --- a/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
> +++ b/drivers/net/ethernet/intel/ixgb/ixgb_ids.h
> @@ -33,11 +33,6 @@
>  ** The Device and Vendor IDs for 10 Gigabit MACs
>  **********************************************************************/
>  
> -#define INTEL_VENDOR_ID             0x8086
> -#define INTEL_SUBVENDOR_ID          0x8086
> -#define SUN_VENDOR_ID               0x108E
> -#define SUN_SUBVENDOR_ID            0x108E
> -
>  #define IXGB_DEVICE_ID_82597EX      0x1048
>  #define IXGB_DEVICE_ID_82597EX_SR   0x1A48
>  #define IXGB_DEVICE_ID_82597EX_LR   0x1B48
> diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> index 5fce363..4e5a060 100644
> --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
> @@ -54,13 +54,13 @@ MODULE_PARM_DESC(copybreak,
>   *   Class, Class Mask, private data (not used) }
>   */
>  static DEFINE_PCI_DEVICE_TABLE(ixgb_pci_tbl) = {
> -	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX,
> +	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX,
>  	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> -	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_CX4,
> +	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_CX4,
>  	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> -	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR,
> +	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_SR,
>  	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
> -	{INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_LR,
> +	{PCI_VENDOR_ID_INTEL, IXGB_DEVICE_ID_82597EX_LR,
>  	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
>  
>  	/* required last entry */
> @@ -195,7 +195,7 @@ ixgb_irq_enable(struct ixgb_adapter *adapter)
>  {
>  	u32 val = IXGB_INT_RXT0 | IXGB_INT_RXDMT0 |
>  		  IXGB_INT_TXDW | IXGB_INT_LSC;
> -	if (adapter->hw.subsystem_vendor_id == SUN_SUBVENDOR_ID)
> +	if (adapter->hw.subsystem_vendor_id == PCI_VENDOR_ID_SUN)
>  		val |= IXGB_INT_GPI0;
>  	IXGB_WRITE_REG(&adapter->hw, IMS, val);
>  	IXGB_WRITE_FLUSH(&adapter->hw);



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [trivial PATCH 2/7] ixgbe: remove unused #define

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1397 bytes --]

On Tue, 2012-07-10 at 15:31 -0700, Jon Mason wrote:
> Remove unused IXGBE_INTEL_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_type.h |    3 ---
>  1 file changed, 3 deletions(-)

This should also go through David Miller's networking tree's.  Adding
netdev mailing list.

Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

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



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [trivial PATCH 2/7] ixgbe: remove unused #define

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1699 bytes --]

On Tue, 2012-07-10 at 15:43 -0700, Jeff Kirsher wrote:
> On Tue, 2012-07-10 at 15:31 -0700, Jon Mason wrote:
> > Remove unused IXGBE_INTEL_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_type.h |    3 ---
> >  1 file changed, 3 deletions(-)
> 
> This should also go through David Miller's networking tree's.  Adding
> netdev mailing list.
> 
> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

After looking at this further, I rescind my ACK.

NAK, this define is used in several places in ixgbe_main.c and the
driver will not compile with this patch.

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


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [trivial PATCH 2/7] ixgbe: remove unused #define

[Jon Mason]

On Thu, Jul 12, 2012 at 11:15 AM, Jeff Kirsher
<jeffrey.t.kirsher@intel.com> wrote:
> On Tue, 2012-07-10 at 15:43 -0700, Jeff Kirsher wrote:
>> On Tue, 2012-07-10 at 15:31 -0700, Jon Mason wrote:
>> > Remove unused IXGBE_INTEL_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_type.h |    3 ---
>> >  1 file changed, 3 deletions(-)
>>
>> This should also go through David Miller's networking tree's.  Adding
>> netdev mailing list.
>>
>> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> After looking at this further, I rescind my ACK.
>
> NAK, this define is used in several places in ixgbe_main.c and the
> driver will not compile with this patch.

My apologies, I was a bit sloppy and simply rebased my old patches
without retesting them.  The code has changed since I originally
pushed the patch (http://www.spinics.net/lists/netdev/msg171523.html).
 I will fix and resubmit.

Thanks,
Jon


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

Re: [trivial PATCH 2/7] ixgbe: remove unused #define

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1847 bytes --]

On Thu, 2012-07-12 at 12:49 -0700, Jon Mason wrote:
> On Thu, Jul 12, 2012 at 11:15 AM, Jeff Kirsher
> <jeffrey.t.kirsher@intel.com> wrote:
> > On Tue, 2012-07-10 at 15:43 -0700, Jeff Kirsher wrote:
> >> On Tue, 2012-07-10 at 15:31 -0700, Jon Mason wrote:
> >> > Remove unused IXGBE_INTEL_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_type.h |    3 ---
> >> >  1 file changed, 3 deletions(-)
> >>
> >> This should also go through David Miller's networking tree's.
> Adding
> >> netdev mailing list.
> >>
> >> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > After looking at this further, I rescind my ACK.
> >
> > NAK, this define is used in several places in ixgbe_main.c and the
> > driver will not compile with this patch.
> 
> My apologies, I was a bit sloppy and simply rebased my old patches
> without retesting them.  The code has changed since I originally
> pushed the patch (http://www.spinics.net/lists/netdev/msg171523.html).
>  I will fix and resubmit.
> 
> Thanks,
> Jon 

Also note, that when you fix up the patch and resend it, could you
resend patch 1 (ixgb) as well to netdev@vger.kernel.org.  That way
netdev patchwork will pickup the patches and I can get them into my
queue.

Thanks!
Jeff



[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]