e1000e/igb/ixgbe: Don't report an error if devices don't support AER
Subsystems (2)
PATCH 1/1 e1000e/igb/ixgbe: Don't report an error if devices don't support AER
From: Frans Pop <[email protected]>
The only error returned by pci_{en,dis}able_pcie_error_reporting() is -EIO which simply means that Advanced Error Reporting is not supported. There is no need to report that, so remove the error check from e1000e, igb and ixgbe.
Signed-off-by Frans Pop <[email protected]>
Signed-off-by Jeff Kirsher <[email protected]>
---
drivers/net/e1000e/netdev.c | 13 ++----------- drivers/net/igb/igb_main.c | 13 ++----------- drivers/net/ixgbe/ixgbe_main.c | 13 ++----------- 3 files changed, 6 insertions(+), 33 deletions(-)
drivers/net/e1000e/netdev.c +2 -11
@@ -4982,12 +4982,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, goto err_pci_reg;/* AER (Advanced Error Reporting) hooks */ - err =pci_enable_pcie_error_reporting (pdev); -if (err) { -dev_err (&pdev->dev,"pci_enable_pcie_error_reporting failed " -"0x%x\n" , err); -/* non-fatal, continue */ - } +pci_enable_pcie_error_reporting (pdev);pci_set_master (pdev);/* PCI config space info */
@@ -5263,7 +5258,6 @@ static void __devexit e1000_remove(struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev);struct e1000_adapter *adapter =netdev_priv (netdev); -int err;/* * flush_scheduled work may reschedule our watchdog task, so
@@ -5299,10 +5293,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)free_netdev (netdev);/* AER disable */ - err =pci_disable_pcie_error_reporting (pdev); -if (err) -dev_err (&pdev->dev, -"pci_disable_pcie_error_reporting failed 0x%x\n" , err); +pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); }
drivers/net/igb/igb_main.c +2 -11
@@ -1246,12 +1246,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,if (err) goto err_pci_reg; - err =pci_enable_pcie_error_reporting (pdev); -if (err) { -dev_err (&pdev->dev,"pci_enable_pcie_error_reporting failed " -"0x%x\n" , err); -/* non-fatal, continue */ - } +pci_enable_pcie_error_reporting (pdev);pci_set_master (pdev);pci_save_state (pdev);
@@ -1628,7 +1623,6 @@ static void __devexit igb_remove(struct pci_dev *pdev)struct net_device *netdev =pci_get_drvdata (pdev);struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw; -int err;/* flush_scheduled work may reschedule our watchdog task, so * explicitly disable watchdog tasks from being rescheduled */
@@ -1682,10 +1676,7 @@ static void __devexit igb_remove(struct pci_dev *pdev)free_netdev (netdev); - err =pci_disable_pcie_error_reporting (pdev); -if (err) -dev_err (&pdev->dev, -"pci_disable_pcie_error_reporting failed 0x%x\n" , err); +pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); }
drivers/net/ixgbe/ixgbe_main.c +2 -11
@@ -5507,12 +5507,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, goto err_pci_reg; } - err =pci_enable_pcie_error_reporting (pdev); -if (err) { -dev_err (&pdev->dev,"pci_enable_pcie_error_reporting failed " -"0x%x\n" , err); -/* non-fatal, continue */ - } +pci_enable_pcie_error_reporting (pdev);pci_set_master (pdev);pci_save_state (pdev);
@@ -5821,7 +5816,6 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev) {struct net_device *netdev =pci_get_drvdata (pdev);struct ixgbe_adapter *adapter =netdev_priv (netdev); -int err;set_bit (__IXGBE_DOWN, &adapter->state);/* 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)free_netdev (netdev); - err =pci_disable_pcie_error_reporting (pdev); -if (err) -dev_err (&pdev->dev, -"pci_disable_pcie_error_reporting failed 0x%x\n" , err); +pci_disable_pcie_error_reporting (pdev);pci_disable_device (pdev); }
From: Jeff Kirsher <[email protected]>
Date: Fri, 02 Oct 2009 00:15:48 -0700
Quoted 9 lines
From: Frans Pop <[email protected]>
The only error returned by pci_{en,dis}able_pcie_error_reporting() is
-EIOwhich simply means that Advanced Error Reporting is not supported. There is no need to report that, so remove the error check from e1000e, igb and ixgbe.Signed-off-by Frans Pop <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied, thanks.