From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Kok, Auke" Subject: Re: [patch 12/18] e1000: #if 0 two functions Date: Tue, 14 Aug 2007 14:18:01 -0700 Message-ID: <46C21C09.30802@intel.com> References: <200708102105.l7AL5M0O008980@imap1.linux-foundation.org> <46C13F54.3030508@garzik.org> <46C21B40.1050301@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: akpm@linux-foundation.org, netdev@vger.kernel.org, bunk@stusta.de To: Jeff Garzik Return-path: Received: from mga03.intel.com ([143.182.124.21]:29409 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750816AbXHNVSa (ORCPT ); Tue, 14 Aug 2007 17:18:30 -0400 In-Reply-To: <46C21B40.1050301@intel.com> Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Kok, Auke wrote: > Jeff Garzik wrote: >> akpm@linux-foundation.org wrote: >>> From: Adrian Bunk >>> >>> e1000_{read,write}_pci_cfg() are no longer used. >>> >>> Signed-off-by: Adrian Bunk >>> Cc: Auke Kok >>> Signed-off-by: Andrew Morton >>> --- >>> >>> drivers/net/e1000/e1000_hw.h | 2 -- >>> drivers/net/e1000/e1000_main.c | 4 ++++ >>> 2 files changed, 4 insertions(+), 2 deletions(-) >> if it's truly dead code in upstream, we should just remove it from e1000 > > if I apply this to #master and compile, it blows up: the two functions are still > in use there. I also don't see any difference with current #upstream.... > > so, I don't know what is in -mm at the moment, but we do not want this in jeff's > tree. whoops, I fail to correlate this with the mmrbc patch I just acked 5 minutes ago, which removes the need for these functions. I'll push a patch to remove these functions once I hear what the plan is for the mmrbc patch. Cheers, Auke