On Wed, Jan 11, Jeff Kirsher wrote:
> Added variable to handle return values for pci_enable_* functions
>
> This was to fix compilation warnings. Also added log messages when
> pci_enable_* functions return with an error.
I object to this patch.
Useless error messages for unhandled return values. Please revert that
part.
No idea if every system in the world is supposed to implement D3 and
friends. But for me it always returns -22. Maybe because I'm short on
A20 gates.
> diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
> index 75cd6df..8207db4 100644
> --- a/drivers/net/e1000/e1000_main.c
> +++ b/drivers/net/e1000/e1000_main.c
> @@ -4382,6 +4382,7 @@ e1000_suspend(struct pci_dev *pdev, pm_m
> struct e1000_adapter *adapter = netdev_priv(netdev);
> uint32_t ctrl, ctrl_ext, rctl, manc, status;
> uint32_t wufc = adapter->wol;
> + int retval = 0;
>
> netif_device_detach(netdev);
>
> @@ -4427,13 +4428,21 @@ e1000_suspend(struct pci_dev *pdev, pm_m
>
> E1000_WRITE_REG(&adapter->hw, WUC, E1000_WUC_PME_EN);
> E1000_WRITE_REG(&adapter->hw, WUFC, wufc);
> - pci_enable_wake(pdev, 3, 1);
> - pci_enable_wake(pdev, 4, 1); /* 4 == D3 cold */
> + retval = pci_enable_wake(pdev, PCI_D3hot, 1);
> + if (retval)
> + DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");
> + retval = pci_enable_wake(pdev, PCI_D3cold, 1);
> + if (retval)
> + DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");
> } else {
> E1000_WRITE_REG(&adapter->hw, WUC, 0);
> E1000_WRITE_REG(&adapter->hw, WUFC, 0);
> - pci_enable_wake(pdev, 3, 0);
> - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
> + retval = pci_enable_wake(pdev, PCI_D3hot, 0);
> + if (retval)
> + DPRINTK(PROBE, ERR, "Error enabling D3 wake\n");
> + retval = pci_enable_wake(pdev, PCI_D3cold, 0); /* 4 == D3 cold
> */
> + if (retval)
> + DPRINTK(PROBE, ERR, "Error enabling D3 cold wake\n");
> }
...
--
short story of a lazy sysadmin:
alias appserv=wotan
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
