From patchwork Fri Jul 20 07:02:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 172135 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BF8F22C0361 for ; Fri, 20 Jul 2012 17:02:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752624Ab2GTHB6 (ORCPT ); Fri, 20 Jul 2012 03:01:58 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:64386 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752482Ab2GTHBw (ORCPT ); Fri, 20 Jul 2012 03:01:52 -0400 Received: by pbbrp8 with SMTP id rp8so5694974pbb.19 for ; Fri, 20 Jul 2012 00:01:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Tyryp7//HWUsT8rOFb5922j+bU54X/hLilrzQjz3RLk=; b=K1GUtiLtqf3vgUMBTYpgGxhuiQH9C/O5kg9/XJhAjlMLUxG0qQakfrO82pp8WOVfkS CoQatZyhDvh3s5MaA2jWZ8QGg0CRBKUUcdB9wGGW2uMNluj/MRP6VgZ4BaRYuVk/NzEi Kpao2CKJH9YM4ugXLmb4gXdMWTQfU6O6yUZ4UsX1UhhdybjDzVZHn33MFzu5Qd/c7Q5I PxK1bhe4Mb1GI9aZIvrf0cmyfxePMtw+Pq3UPDomNn7ovAsVzGUS2Sx30kvQPphb+zYE /T3lcEWI4jJsfOACrzpoLBk84nfBAAukHwOa/i/KK9Yn7T1btza4PvqCW89dbnfuF65v Otdw== Received: by 10.68.225.201 with SMTP id rm9mr11337025pbc.71.1342767711124; Fri, 20 Jul 2012 00:01:51 -0700 (PDT) Received: from scylla (184-98-28-109.phnx.qwest.net. [184.98.28.109]) by mx.google.com with ESMTPS id qa5sm3395038pbb.19.2012.07.20.00.01.48 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 00:01:50 -0700 (PDT) Received: by scylla (sSMTP sendmail emulation); Fri, 20 Jul 2012 00:02:16 -0700 From: Jon Mason To: trivial@kernel.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Jeff Kirsher , Jesse Brandeburg , Bruce Allan , Carolyn Wyborny , Don Skidmore , Greg Rose , Peter P Waskiewicz Jr , Alex Duyck , John Ronciak Subject: [trivial PATCH resend 1/2] ixgb: use PCI_VENDOR_ID_INTEL Date: Fri, 20 Jul 2012 00:02:08 -0700 Message-Id: <1342767729-17788-2-git-send-email-jdmason@kudzu.us> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342767729-17788-1-git-send-email-jdmason@kudzu.us> References: <1342767729-17788-1-git-send-email-jdmason@kudzu.us> X-Gm-Message-State: ALoCoQkaJwl+EtxImUhESLEKWXP9zP88TCTxMY6lVYwxPzh6MM6MTdefez4q/I7i/atveyOYwBYy Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use PCI_VENDOR_ID_INTEL from pci_ids.h instead of creating its own vendor ID #define. Signed-off-by: Jon Mason Cc: Jeff Kirsher Cc: Jesse Brandeburg Cc: Bruce Allan Cc: Carolyn Wyborny Cc: Don Skidmore Cc: Greg Rose Cc: Peter P Waskiewicz Jr Cc: Alex Duyck Cc: John Ronciak Acked-by: Jeff Kirsher --- 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 #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);