diff options
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_main.c')
-rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 1cbc6a318b67..28fbb9d281f9 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
@@ -5507,12 +5507,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
5507 | goto err_pci_reg; | 5507 | goto err_pci_reg; |
5508 | } | 5508 | } |
5509 | 5509 | ||
5510 | err = pci_enable_pcie_error_reporting(pdev); | 5510 | pci_enable_pcie_error_reporting(pdev); |
5511 | if (err) { | ||
5512 | dev_err(&pdev->dev, "pci_enable_pcie_error_reporting failed " | ||
5513 | "0x%x\n", err); | ||
5514 | /* non-fatal, continue */ | ||
5515 | } | ||
5516 | 5511 | ||
5517 | pci_set_master(pdev); | 5512 | pci_set_master(pdev); |
5518 | pci_save_state(pdev); | 5513 | pci_save_state(pdev); |
@@ -5821,7 +5816,6 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) | |||
5821 | { | 5816 | { |
5822 | struct net_device *netdev = pci_get_drvdata(pdev); | 5817 | struct net_device *netdev = pci_get_drvdata(pdev); |
5823 | struct ixgbe_adapter *adapter = netdev_priv(netdev); | 5818 | struct ixgbe_adapter *adapter = netdev_priv(netdev); |
5824 | int err; | ||
5825 | 5819 | ||
5826 | set_bit(__IXGBE_DOWN, &adapter->state); | 5820 | set_bit(__IXGBE_DOWN, &adapter->state); |
5827 | /* clear the module not found bit to make sure the worker won't | 5821 | /* clear the module not found bit to make sure the worker won't |
@@ -5872,10 +5866,7 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) | |||
5872 | 5866 | ||
5873 | free_netdev(netdev); | 5867 | free_netdev(netdev); |
5874 | 5868 | ||
5875 | err = pci_disable_pcie_error_reporting(pdev); | 5869 | pci_disable_pcie_error_reporting(pdev); |
5876 | if (err) | ||
5877 | dev_err(&pdev->dev, | ||
5878 | "pci_disable_pcie_error_reporting failed 0x%x\n", err); | ||
5879 | 5870 | ||
5880 | pci_disable_device(pdev); | 5871 | pci_disable_device(pdev); |
5881 | } | 5872 | } |