From patchwork Sat Oct 10 19:35:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ron Mercer X-Patchwork-Id: 35670 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 4995DB7B70 for ; Sun, 11 Oct 2009 06:43:06 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934767AbZJJTl7 (ORCPT ); Sat, 10 Oct 2009 15:41:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S934765AbZJJTl6 (ORCPT ); Sat, 10 Oct 2009 15:41:58 -0400 Received: from avexch1.qlogic.com ([198.70.193.115]:55225 "EHLO avexch1.qlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934754AbZJJTl6 (ORCPT ); Sat, 10 Oct 2009 15:41:58 -0400 Received: from linux-ox1b.qlogic.com ([172.17.161.157]) by avexch1.qlogic.com with Microsoft SMTPSVC(6.0.3790.1830); Sat, 10 Oct 2009 12:40:18 -0700 Received: by linux-ox1b.qlogic.com (Postfix, from userid 1000) id 3AB6C2C688; Sat, 10 Oct 2009 12:35:10 -0700 (PDT) From: Ron Mercer To: davem@davemloft.net Cc: netdev@vger.kernel.org, ron.mercer@qlogic.com, root Subject: [net-next PATCH 1/8] qlge: Remove explicit setting of PCI Dev CTL reg. Date: Sat, 10 Oct 2009 12:35:03 -0700 Message-Id: <1255203310-18114-2-git-send-email-ron.mercer@qlogic.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1255203310-18114-1-git-send-email-ron.mercer@qlogic.com> References: <1255203310-18114-1-git-send-email-ron.mercer@qlogic.com> X-OriginalArrivalTime: 10 Oct 2009 19:40:18.0354 (UTC) FILETIME=[7F2C0120:01CA49E1] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: root Remove explicit setting of error reporting bits. Signed-off-by: root Signed-off-by: Ron Mercer --- drivers/net/qlge/qlge_main.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 48b45df..7a9dca8 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -3868,8 +3868,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev, struct net_device *ndev, int cards_found) { struct ql_adapter *qdev = netdev_priv(ndev); - int pos, err = 0; - u16 val16; + int err = 0; memset((void *)qdev, 0, sizeof(*qdev)); err = pci_enable_device(pdev); @@ -3881,19 +3880,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev, qdev->ndev = ndev; qdev->pdev = pdev; pci_set_drvdata(pdev, ndev); - pos = pci_find_capability(pdev, PCI_CAP_ID_EXP); - if (pos <= 0) { - dev_err(&pdev->dev, PFX "Cannot find PCI Express capability, " - "aborting.\n"); - return pos; - } else { - pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16); - val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN; - val16 |= (PCI_EXP_DEVCTL_CERE | - PCI_EXP_DEVCTL_NFERE | - PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE); - pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16); - } err = pci_request_regions(pdev, DRV_NAME); if (err) {