aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge
diff options
context:
space:
mode:
authorRon Mercer <ron.mercer@qlogic.com>2009-10-10 05:35:03 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-12 02:16:12 -0400
commit1d1023d039d8295070b8dbb92c4d972237235304 (patch)
tree3d2e8e1a9efda7bb4af182d93b52c272c4db1983 /drivers/net/qlge
parent7fe13c5733790ef582769a54693fa6a5abf3c032 (diff)
qlge: Remove explicit setting of PCI Dev CTL reg.
Remove explicit setting of error reporting bits. Signed-off-by: Ron Mercer <ron.mercer@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlge')
-rw-r--r--drivers/net/qlge/qlge_main.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index cd093db29ada..9fbded4d7195 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,
3868 struct net_device *ndev, int cards_found) 3868 struct net_device *ndev, int cards_found)
3869{ 3869{
3870 struct ql_adapter *qdev = netdev_priv(ndev); 3870 struct ql_adapter *qdev = netdev_priv(ndev);
3871 int pos, err = 0; 3871 int err = 0;
3872 u16 val16;
3873 3872
3874 memset((void *)qdev, 0, sizeof(*qdev)); 3873 memset((void *)qdev, 0, sizeof(*qdev));
3875 err = pci_enable_device(pdev); 3874 err = pci_enable_device(pdev);
@@ -3881,19 +3880,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
3881 qdev->ndev = ndev; 3880 qdev->ndev = ndev;
3882 qdev->pdev = pdev; 3881 qdev->pdev = pdev;
3883 pci_set_drvdata(pdev, ndev); 3882 pci_set_drvdata(pdev, ndev);
3884 pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
3885 if (pos <= 0) {
3886 dev_err(&pdev->dev, PFX "Cannot find PCI Express capability, "
3887 "aborting.\n");
3888 return pos;
3889 } else {
3890 pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16);
3891 val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
3892 val16 |= (PCI_EXP_DEVCTL_CERE |
3893 PCI_EXP_DEVCTL_NFERE |
3894 PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_URRE);
3895 pci_write_config_word(pdev, pos + PCI_EXP_DEVCTL, val16);
3896 }
3897 3883
3898 err = pci_request_regions(pdev, DRV_NAME); 3884 err = pci_request_regions(pdev, DRV_NAME);
3899 if (err) { 3885 if (err) {