From patchwork Sat Jul 31 15:05:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Krzysztof Halasa X-Patchwork-Id: 60421 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 520C81007D2 for ; Sun, 1 Aug 2010 01:07:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756683Ab0GaPGv (ORCPT ); Sat, 31 Jul 2010 11:06:51 -0400 Received: from khc.piap.pl ([195.187.100.11]:45531 "EHLO khc.piap.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756591Ab0GaPGY (ORCPT ); Sat, 31 Jul 2010 11:06:24 -0400 Received: from intrepid.localdomain (intrepid.localdomain [10.0.0.2]) by khc.piap.pl (Postfix) with ESMTP id 7D41299D5; Sat, 31 Jul 2010 17:05:54 +0200 (CEST) From: Krzysztof Halasa To: David Miller Cc: Subject: [PATCH 21/29] LMC: I'm sure Linux doesn't swap PCI subsystem device and vendor IDs. Date: Sat, 31 Jul 2010 17:05:44 +0200 Message-Id: <1280588752-9340-21-git-send-email-khc@pm.waw.pl> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Krzysztof Hałasa Signed-off-by: Krzysztof Hałasa --- drivers/net/wan/lmc/main.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/drivers/net/wan/lmc/main.c b/drivers/net/wan/lmc/main.c index 2229e0a..bd7def0 100644 --- a/drivers/net/wan/lmc/main.c +++ b/drivers/net/wan/lmc/main.c @@ -77,8 +77,6 @@ static int LMC_PKT_BUF_SZ = 1542; static DEFINE_PCI_DEVICE_TABLE(lmc_pci_tbl) = { { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, PCI_VENDOR_ID_LMC, PCI_ANY_ID }, - { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST, - PCI_ANY_ID, PCI_VENDOR_ID_LMC }, { 0 } }; @@ -773,14 +771,6 @@ static int __devinit lmc_init_one(struct pci_dev *pdev, sc->cardtype = LMC_CARDTYPE_UNKNOWN; sc->timing = LMC_CTL_CLOCK_SOURCE_EXT; - /* - * Check either the subvendor or the subdevice, some systems reverse - * the setting in the bois, seems to be version and arch dependent? - * Fix the error, exchange the two values - */ - if ((subdevice = pdev->subsystem_device) == PCI_VENDOR_ID_LMC) - subdevice = pdev->subsystem_vendor; - switch (subdevice) { case PCI_DEVICE_ID_LMC_HSSI: dev_info(&pdev->dev, "%s = LMC HSSI\n", dev->name);