2006-08-07 20:18:04

by linas

Subject: [PATCH]: e1000: Janitor: Use #defined values for literals

Resending patch from 23 June 2006; there was some confusion about
whether a similar patch had already been applied; seems it wasn't.

Minor janitorial patch: use #defines for literal values.

Signed-off-by: Linas Vepstas <[email protected]>

----
drivers/net/e1000/e1000_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c
===================================================================
--- linux-2.6.18-rc3-mm2.orig/drivers/net/e1000/e1000_main.c 2006-08-07 14:39:37.000000000 -0500
+++ linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c 2006-08-07 15:06:31.000000000 -0500
@@ -4955,8 +4955,8 @@ static pci_ers_result_t e1000_io_slot_re
}
pci_set_master(pdev);

- pci_enable_wake(pdev, 3, 0);
- pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
+ pci_enable_wake(pdev, PCI_D3hot, 0);
+ pci_enable_wake(pdev, PCI_D3cold, 0);

/* Perform card reset only on one instance of the card */
if (PCI_FUNC (pdev->devfn) != 0)

2006-08-07 20:24:22

by Kok, Auke

Subject: Re: [PATCH]: e1000: Janitor: Use #defined values for literals

Linas Vepstas wrote:
> Resending patch from 23 June 2006; there was some confusion about
> whether a similar patch had already been applied; seems it wasn't.
>
> Minor janitorial patch: use #defines for literal values.
>
> Signed-off-by: Linas Vepstas <[email protected]>

Acked-by: Auke Kok <[email protected]>

>
> ----
> drivers/net/e1000/e1000_main.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Index: linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c
> ===================================================================
> --- linux-2.6.18-rc3-mm2.orig/drivers/net/e1000/e1000_main.c 2006-08-07 14:39:37.000000000 -0500
> +++ linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c 2006-08-07 15:06:31.000000000 -0500
> @@ -4955,8 +4955,8 @@ static pci_ers_result_t e1000_io_slot_re
> }
> pci_set_master(pdev);
>
> - pci_enable_wake(pdev, 3, 0);
> - pci_enable_wake(pdev, 4, 0); /* 4 == D3 cold */
> + pci_enable_wake(pdev, PCI_D3hot, 0);
> + pci_enable_wake(pdev, PCI_D3cold, 0);
>
> /* Perform card reset only on one instance of the card */
> if (PCI_FUNC (pdev->devfn) != 0)
> -
> 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

2006-08-07 20:29:27

by Jeff Garzik

Subject: Re: [PATCH]: e1000: Janitor: Use #defined values for literals

hopefully queued-by, as well...