Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19d5afd4 authored by Frans Pop's avatar Frans Pop Committed by David S. Miller
Browse files

e1000e/igb/ixgbe: Don't report an error if devices don't support AER 



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: default avatarFrans Pop <elendil@planet.nl>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b607bd90

drivers/net/e1000e/netdev.c

+2 −11
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}