Re: [PATCH] e1000e: fix use of pci_enable_pcie_error_reporting

[David Miller <davem@davemloft.net>]

From: Xiaotian Feng <dfeng@redhat.com>
Date: Fri,  7 Aug 2009 17:36:14 +0800

> commit 111b9dc5 introduces pcie aer support for e1000e, but it is not
> reasonable to disable it in e1000_remove but enable it in e1000_resume.
> This patch enables aer support in e1000_probe.
> 
> Signed-off-by: Xiaotian Feng <dfeng@redhat.com>

In moving this block of code, you've corrupted the indentation,
making it more indented than it should be.

In any event, I expect the Intel folks to pick this up.

> diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
> index 63415bb..e2f0304 100644
> --- a/drivers/net/e1000e/netdev.c
> +++ b/drivers/net/e1000e/netdev.c
> @@ -4670,14 +4670,6 @@ static int e1000_resume(struct pci_dev *pdev)
>  		return err;
>  	}
>  
> -	/* 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_set_master(pdev);
>  
>  	pci_enable_wake(pdev, PCI_D3hot, 0);
> @@ -4990,6 +4982,14 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
>  	if (err)
>  		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_set_master(pdev);
>  	/* PCI config space info */
>  	err = pci_save_state(pdev);
> -- 
> 1.6.2.5
>