Skip to contentSkip to conversation

: e1000: Janitor: Use #defined values for literals

PATCH In review Linas Vepstas 3 participants 6 messages Jun 23, 2006 – Jun 27, 2006

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

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

Minor janitorial patch: use #defines for literal values.

----

 drivers/net/e1000/e1000_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/e1000/e1000_main.c +2 -2
Index: linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c
===================================================================
@@ -4663,8 +4663,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 3 lines · Linas Vepstas

Minor janitorial patch: use #defines for literal values.

Ack! I thought we had gotten these out already.

Cheers,

Auke

Quoted 24 lines

----

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

Index: linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c
===================================================================

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

#2 lore raw
In reply to Linas Vepstas
Quoted 13 lines · Linas Vepstas

Minor janitorial patch: use #defines for literal values.

----

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

Index: linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c
===================================================================

drivers/net/e1000/e1000_main.c static pci_ers_result_t e1000_io_slot_re · line 4670

Quoted 10 lines
drivers/net/e1000/e1000_main.c +2 -2
@@ -4663,8 +4663,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)

I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this).

This patch would conflict with them so please don't apply.

Cheers,

AUke

#3 lore raw
Quoted 12 lines · Auke Kok

drivers/net/e1000/e1000_main.c static pci_ers_result_t e1000_io_slot_re · line 4667

Quoted 7 lines · Linas Vepstas

Minor janitorial patch: use #defines for literal values.

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

I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this).

Quoted 1 line

This patch would conflict with them so please don't apply.

Oh, OK, I didn't see the patches sent yesterday, I tripped over this on an unrelated code walk.

--linas

#4 lore raw
In reply to Auke Kok
Quoted 10 lines · Auke Kok

drivers/net/e1000/e1000_main.c static pci_ers_result_t e1000_io_slot_re · line 4667

Quoted 3 lines · Linas Vepstas

Minor janitorial patch: use #defines for literal values.

drivers/net/e1000/e1000_main.c +2 -0
+	pci_enable_wake(pdev, PCI_D3hot, 0);
+	pci_enable_wake(pdev, PCI_D3cold, 0);

I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this).

This patch would conflict with them so please don't apply.

Maybe there's a backlog in the queue, but I not this is not yet in 2.6.17-mm3

--linas

#5 lore raw
Quoted 10 lines · Linas Vepstas
Quoted 7 lines · Auke Kok

drivers/net/e1000/e1000_main.c static pci_ers_result_t e1000_io_slot_re · line 4667

Quoted 3 lines · Linas Vepstas

Minor janitorial patch: use #defines for literal values.

drivers/net/e1000/e1000_main.c +2 -0
+	pci_enable_wake(pdev, PCI_D3hot, 0);
+	pci_enable_wake(pdev, PCI_D3cold, 0);

I Acked this but that's silly - the patches sent yesterday already change the code above and this patch is no longer needed (thanks Jesse for spotting this).

This patch would conflict with them so please don't apply.

Maybe there's a backlog in the queue, but I not this is not yet in 2.6.17-mm3

It's part of the submission for 2.6.18 I sent to jgarzik on friday, which cleans up this section in the way.

Auke