Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755061Ab0AZX4Y (ORCPT ); Tue, 26 Jan 2010 18:56:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755458Ab0AZXzv (ORCPT ); Tue, 26 Jan 2010 18:55:51 -0500 Received: from kroah.org ([198.145.64.141]:35356 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754627Ab0AZXnq (ORCPT ); Tue, 26 Jan 2010 18:43:46 -0500 X-Mailbox-Line: From gregkh@mini.kroah.org Tue Jan 26 15:39:28 2010 Message-Id: <20100126233927.978120025@mini.kroah.org> User-Agent: quilt/0.48-1 Date: Tue, 26 Jan 2010 15:34:20 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Ron Mercer , "David S. Miller" Subject: [54/98] qlge: Remove explicit setting of PCI Dev CTL reg. In-Reply-To: <20100126233950.GA5372@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1778 Lines: 57 2.6.32-stable review patch. If anyone has any objections, please let us know. ------------------ From: Ron Mercer commit 1d1023d039d8295070b8dbb92c4d972237235304 upstream. Remove explicit setting of error reporting bits. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/qlge/qlge_main.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -3868,8 +3868,7 @@ static int __devinit ql_init_device(stru 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(stru 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) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/