From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752013AbWFWUHz (ORCPT ); Fri, 23 Jun 2006 16:07:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752011AbWFWUHz (ORCPT ); Fri, 23 Jun 2006 16:07:55 -0400 Received: from mga03.intel.com ([143.182.124.21]:54311 "EHLO azsmga101-1.ch.intel.com") by vger.kernel.org with ESMTP id S1751974AbWFWUHy (ORCPT ); Fri, 23 Jun 2006 16:07:54 -0400 X-IronPort-AV: i="4.06,170,1149490800"; d="scan'208"; a="56627610:sNHT16384914" Message-ID: <449C49F9.6090005@intel.com> Date: Fri, 23 Jun 2006 13:07:21 -0700 From: Auke Kok User-Agent: Mail/News 1.5.0.4 (X11/20060617) MIME-Version: 1.0 To: Linas Vepstas CC: netdev@vger.kernel.org, john.ronciak@intel.com, jesse.brandeburg@intel.com, jeffrey.t.kirsher@intel.com, "Zhang, Yanmin" , Jeff Garzik , linux-kernel@vger.kernel.org Subject: Re: [PATCH]: e1000: Janitor: Use #defined values for literals References: <20060623163624.GM8866@austin.ibm.com> In-Reply-To: <20060623163624.GM8866@austin.ibm.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 23 Jun 2006 20:07:52.0656 (UTC) FILETIME=[B571B500:01C69700] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Linas Vepstas wrote: > Minor janitorial patch: use #defines for literal values. > > Signed-off-by: Linas Vepstas > > ---- > 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