diff options
Diffstat (limited to 'drivers/net/igb/igb_main.c')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 5d6c1530a8c0..714c3a4a44ef 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -1246,12 +1246,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
| 1246 | if (err) | 1246 | if (err) |
| 1247 | goto err_pci_reg; | 1247 | goto err_pci_reg; |
| 1248 | 1248 | ||
| 1249 | err = pci_enable_pcie_error_reporting(pdev); | 1249 | pci_enable_pcie_error_reporting(pdev); |
| 1250 | if (err) { | ||
| 1251 | dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " | ||
| 1252 | "0x%x\n", err); | ||
| 1253 | /* non-fatal, continue */ | ||
| 1254 | } | ||
| 1255 | 1250 | ||
| 1256 | pci_set_master(pdev); | 1251 | pci_set_master(pdev); |
| 1257 | pci_save_state(pdev); | 1252 | pci_save_state(pdev); |
| @@ -1628,7 +1623,6 @@ static void __devexit igb_remove(struct pci_dev *pdev) | |||
| 1628 | struct net_device *netdev = pci_get_drvdata(pdev); | 1623 | struct net_device *netdev = pci_get_drvdata(pdev); |
| 1629 | struct igb_adapter *adapter = netdev_priv(netdev); | 1624 | struct igb_adapter *adapter = netdev_priv(netdev); |
| 1630 | struct e1000_hw *hw = &adapter->hw; | 1625 | struct e1000_hw *hw = &adapter->hw; |
| 1631 | int err; | ||
| 1632 | 1626 | ||
| 1633 | /* flush_scheduled work may reschedule our watchdog task, so | 1627 | /* flush_scheduled work may reschedule our watchdog task, so |
| 1634 | * explicitly disable watchdog tasks from being rescheduled */ | 1628 | * explicitly disable watchdog tasks from being rescheduled */ |
| @@ -1682,10 +1676,7 @@ static void __devexit igb_remove(struct pci_dev *pdev) | |||
| 1682 | 1676 | ||
| 1683 | free_netdev(netdev); | 1677 | free_netdev(netdev); |
| 1684 | 1678 | ||
| 1685 | err = pci_disable_pcie_error_reporting(pdev); | 1679 | pci_disable_pcie_error_reporting(pdev); |
| 1686 | if (err) | ||
| 1687 | dev_err(&pdev->dev, | ||
| 1688 | "pci_disable_pcie_error_reporting failed 0x%x\n", err); | ||
| 1689 | 1680 | ||
| 1690 | pci_disable_device(pdev); | 1681 | pci_disable_device(pdev); |
| 1691 | } | 1682 | } |
