From patchwork Tue Feb 9 11:28:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 44899 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 DC513B7D2B for ; Tue, 9 Feb 2010 22:28:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166Ab0BIL2p (ORCPT ); Tue, 9 Feb 2010 06:28:45 -0500 Received: from mail-iw0-f182.google.com ([209.85.223.182]:65424 "EHLO mail-iw0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753335Ab0BIL2o (ORCPT ); Tue, 9 Feb 2010 06:28:44 -0500 Received: by iwn12 with SMTP id 12so8472496iwn.26 for ; Tue, 09 Feb 2010 03:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:reply-to:mime-version:content-type:content-disposition :x-url:organization:user-agent:x-os; bh=v+s7S69+JcGkcBup5A+edhXiv4gygea6jn5/BAX01EI=; b=DBoHp9YigeJeEErvR01oQ4vggd/txl0ijYZr3QoI9OxKRiq8VrcdA0KnTMrOqCcSdf y2TuCKJOBsbJVr4pyZRTprEXyrpTHvqNy3piBEofSRT5T61HQcp3pOUDBBXY/sGZTV4i FC8UCC1nUH45Aus8qT6Amssafv4ueWhyyHnkk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:reply-to:mime-version:content-type :content-disposition:x-url:organization:user-agent:x-os; b=MYpLHzBECxqAavgwBeqe6SnSgprp3jSkxx+GH1MNNvcYEyPiEDHdgoTKYd0hMVBCzt qk5oX4p9/SGGGuyr5rynEX5exXIZ1TEDEFe4Pxj1X6gnY2n+JiVD7qUax08XAED1pT7K Gtt25vzQv/2hJNsjoBS4jrWTWRbvfCnh7c0wA= Received: by 10.231.158.205 with SMTP id g13mr51596ibx.30.1265714923916; Tue, 09 Feb 2010 03:28:43 -0800 (PST) Received: from serverengines.com ([124.30.166.146]) by mx.google.com with ESMTPS id 20sm5365859iwn.5.2010.02.09.03.28.38 (version=SSLv3 cipher=RC4-MD5); Tue, 09 Feb 2010 03:28:41 -0800 (PST) Date: Tue, 9 Feb 2010 16:58:35 +0530 From: Ajit Khaparde To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 1/7] be2net: remove unused pci device id Message-ID: <20100209112824.GA10418@serverengines.com> Reply-To: Ajit Khaparde MIME-Version: 1.0 Content-Disposition: inline X-URL: http://www.serverengines.com Organization: ServerEngines Corp User-Agent: "Ajit's Mutt" X-OS: Linux x86_64 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We are not going to use this device id. Signed-off-by: Ajit Khaparde --- drivers/net/benet/be.h | 6 ++---- drivers/net/benet/be_main.c | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 5bc7459..2420131 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -44,16 +44,14 @@ #define BE_DEVICE_ID1 0x211 #define BE_DEVICE_ID2 0x221 #define OC_DEVICE_ID1 0x700 -#define OC_DEVICE_ID2 0x701 -#define OC_DEVICE_ID3 0x710 +#define OC_DEVICE_ID2 0x710 static inline char *nic_name(struct pci_dev *pdev) { switch (pdev->device) { case OC_DEVICE_ID1: - case OC_DEVICE_ID2: return OC_NAME; - case OC_DEVICE_ID3: + case OC_DEVICE_ID2: return OC_NAME1; case BE_DEVICE_ID2: return BE3_NAME; diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 626b76c..f9e18eb 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -34,7 +34,6 @@ static DEFINE_PCI_DEVICE_TABLE(be_dev_ids) = { { PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) }, { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) }, { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) }, - { PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) }, { 0 } }; MODULE_DEVICE_TABLE(pci, be_dev_ids);