Skip to contentSkip to conversation

: e1000: Janitor: Use #defined values for literals

PATCH In review Linas Vepstas 3 participants 3 messages Aug 7, 2006

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Linas Vepstas

author
#0 lore raw

PATCH 1/1 : 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(-)
drivers/net/e1000/e1000_main.c +2 -2
Index: linux-2.6.18-rc3-mm2/drivers/net/e1000/e1000_main.c
===================================================================
@@ -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)
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Linas Vepstas

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]>
Quoted 24 lines

----

 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
===================================================================

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