Skip to contentSkip to conversation

: e1000: Janitor: Use #defined values for literals

PATCH In review Linas Vepstas 2 participants 2 messages Sep 25, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : e1000: Janitor: Use #defined values for literals

Resending a minor janitorial patch from long ago that seems to have fallen through the cracks. Its not in 2.6.18-git4 nor in 2.6.18-mm1. Please apply and forward upstream.

--linas

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

Minor janitorial patch: use #defines for literal values.

----

 drivers/net/e1000/e1000_main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000_main.c +2 -2
Index: linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c
===================================================================
@@ -4986,8 +4986,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)
#1 lore raw
Quoted 10 lines · Linas Vepstas

Resending a minor janitorial patch from long ago that seems to have fallen through the cracks. Its not in 2.6.18-git4 nor in 2.6.18-mm1. Please apply and forward upstream.

--linas

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

Minor janitorial patch: use #defines for literal values.

I'll stack this on this weeks resend of last weeks e1000/e100/ixgb changes.

Thanks.

Auke

Quoted 24 lines

----

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

Index: linux-2.6.18-mm1/drivers/net/e1000/e1000_main.c
===================================================================

drivers/net/e1000/e1000_main.c +2 -3
@@ -4986,8 +4986,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