* [PATCH]: e1000: Janitor: Use #defined values for literals
@ 2006-06-23 16:36 Linas Vepstas
2006-06-23 18:07 ` Auke Kok
2006-06-23 20:07 ` Auke Kok
0 siblings, 2 replies; 9+ messages in thread
From: Linas Vepstas @ 2006-06-23 16:36 UTC (permalink / raw)
To: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang, Yanmin
Cc: Jeff Garzik, linux-kernel
Minor janitorial patch: use #defines for literal values.
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
----
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
===================================================================
--- linux-2.6.17-rc6-mm2.orig/drivers/net/e1000/e1000_main.c 2006-06-13 18:13:30.000000000 -0500
+++ linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c 2006-06-23 11:27:47.000000000 -0500
@@ -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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-06-23 16:36 [PATCH]: e1000: Janitor: Use #defined values for literals Linas Vepstas
@ 2006-06-23 18:07 ` Auke Kok
2006-06-23 20:07 ` Auke Kok
1 sibling, 0 replies; 9+ messages in thread
From: Auke Kok @ 2006-06-23 18:07 UTC (permalink / raw)
To: Linas Vepstas
Cc: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang,
Yanmin, Jeff Garzik, linux-kernel
Linas Vepstas wrote:
> Minor janitorial patch: use #defines for literal values.
>
> Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Ack! I thought we had gotten these out already.
Cheers,
Auke
>
> ----
> 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
> ===================================================================
> --- linux-2.6.17-rc6-mm2.orig/drivers/net/e1000/e1000_main.c 2006-06-13 18:13:30.000000000 -0500
> +++ linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c 2006-06-23 11:27:47.000000000 -0500
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-06-23 16:36 [PATCH]: e1000: Janitor: Use #defined values for literals Linas Vepstas
2006-06-23 18:07 ` Auke Kok
@ 2006-06-23 20:07 ` Auke Kok
2006-06-23 21:12 ` Linas Vepstas
2006-06-27 17:32 ` Linas Vepstas
1 sibling, 2 replies; 9+ messages in thread
From: Auke Kok @ 2006-06-23 20:07 UTC (permalink / raw)
To: Linas Vepstas
Cc: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang,
Yanmin, Jeff Garzik, linux-kernel
Linas Vepstas wrote:
> Minor janitorial patch: use #defines for literal values.
>
> Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
>
> ----
> 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
> ===================================================================
> --- linux-2.6.17-rc6-mm2.orig/drivers/net/e1000/e1000_main.c 2006-06-13 18:13:30.000000000 -0500
> +++ linux-2.6.17-rc6-mm2/drivers/net/e1000/e1000_main.c 2006-06-23 11:27:47.000000000 -0500
> @@ -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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-06-23 20:07 ` Auke Kok
@ 2006-06-23 21:12 ` Linas Vepstas
2006-06-27 17:32 ` Linas Vepstas
1 sibling, 0 replies; 9+ messages in thread
From: Linas Vepstas @ 2006-06-23 21:12 UTC (permalink / raw)
To: Auke Kok
Cc: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang,
Yanmin, Jeff Garzik, linux-kernel
On Fri, Jun 23, 2006 at 01:07:21PM -0700, Auke Kok wrote:
> Linas Vepstas wrote:
> >Minor janitorial patch: use #defines for literal values.
> >
> >- 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).
>
> 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-06-23 20:07 ` Auke Kok
2006-06-23 21:12 ` Linas Vepstas
@ 2006-06-27 17:32 ` Linas Vepstas
2006-06-27 18:03 ` Auke Kok
1 sibling, 1 reply; 9+ messages in thread
From: Linas Vepstas @ 2006-06-27 17:32 UTC (permalink / raw)
To: Auke Kok
Cc: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang,
Yanmin, Jeff Garzik, linux-kernel
On Fri, Jun 23, 2006 at 01:07:21PM -0700, Auke Kok wrote:
> Linas Vepstas wrote:
> >Minor janitorial patch: use #defines for literal values.
> >+ 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-06-27 17:32 ` Linas Vepstas
@ 2006-06-27 18:03 ` Auke Kok
0 siblings, 0 replies; 9+ messages in thread
From: Auke Kok @ 2006-06-27 18:03 UTC (permalink / raw)
To: Linas Vepstas
Cc: netdev, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher, Zhang,
Yanmin, Jeff Garzik, linux-kernel
Linas Vepstas wrote:
> On Fri, Jun 23, 2006 at 01:07:21PM -0700, Auke Kok wrote:
>> Linas Vepstas wrote:
>>> Minor janitorial patch: use #defines for literal values.
>>> + 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
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH]: e1000: Janitor: Use #defined values for literals
@ 2006-08-07 20:16 Linas Vepstas
2006-08-07 20:21 ` Auke Kok
0 siblings, 1 reply; 9+ messages in thread
From: Linas Vepstas @ 2006-08-07 20:16 UTC (permalink / raw)
To: Jeff Garzik, netdev, Auke Kok
Cc: linux-kernel, john.ronciak, jesse.brandeburg, jeffrey.t.kirsher,
Zhang, Yanmin
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 <linas@austin.ibm.com>
----
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)
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-08-07 20:16 Linas Vepstas
@ 2006-08-07 20:21 ` Auke Kok
2006-08-07 20:29 ` Jeff Garzik
0 siblings, 1 reply; 9+ messages in thread
From: Auke Kok @ 2006-08-07 20:21 UTC (permalink / raw)
To: Linas Vepstas, Jeff Garzik
Cc: netdev, Auke Kok, linux-kernel, john.ronciak, jesse.brandeburg,
jeffrey.t.kirsher, Zhang, Yanmin
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 <linas@austin.ibm.com>
Acked-by: Auke Kok <auke-jan.h.kok@intel.com>
>
> ----
> 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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH]: e1000: Janitor: Use #defined values for literals
2006-08-07 20:21 ` Auke Kok
@ 2006-08-07 20:29 ` Jeff Garzik
0 siblings, 0 replies; 9+ messages in thread
From: Jeff Garzik @ 2006-08-07 20:29 UTC (permalink / raw)
To: Auke Kok
Cc: Linas Vepstas, netdev, Auke Kok, linux-kernel, john.ronciak,
jesse.brandeburg, jeffrey.t.kirsher, Zhang, Yanmin
hopefully queued-by, as well...
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2006-08-07 20:29 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-23 16:36 [PATCH]: e1000: Janitor: Use #defined values for literals Linas Vepstas
2006-06-23 18:07 ` Auke Kok
2006-06-23 20:07 ` Auke Kok
2006-06-23 21:12 ` Linas Vepstas
2006-06-27 17:32 ` Linas Vepstas
2006-06-27 18:03 ` Auke Kok
2006-08-07 20:16 Linas Vepstas
2006-08-07 20:21 ` Auke Kok
2006-08-07 20:29 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).