From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbbGVBlX (ORCPT ); Tue, 21 Jul 2015 21:41:23 -0400 Received: from ozlabs.org ([103.22.144.67]:33241 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219AbbGVBlV (ORCPT ); Tue, 21 Jul 2015 21:41:21 -0400 Message-ID: <1437529280.16792.9.camel@ellerman.id.au> Subject: Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM From: Michael Ellerman To: Jeff Kirsher Cc: "Avargil, Raanan" , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, intel-wired-lan@lists.osuosl.org, aaron.f.brown@intel.com, yanirx.lubetkin@intel.com, jesse.brandeburg@intel.com, shannon.nelson@intel.com, carolyn.wyborny@intel.com, donald.c.skidmore@intel.com, matthew.vick@intel.com, john.ronciak@intel.com, mitch.a.williams@intel.com Date: Wed, 22 Jul 2015 11:41:20 +1000 In-Reply-To: <1436956216.13597.8.camel@intel.com> References: <1436846075-29366-1-git-send-email-mpe@ellerman.id.au> <1436956216.13597.8.camel@intel.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.10-0ubuntu1~14.10.1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2015-07-15 at 03:30 -0700, Jeff Kirsher wrote: > On Tue, 2015-07-14 at 13:54 +1000, Michael Ellerman wrote: > > e1000e_disable_aspm_locked() is only used in __e1000_resume() which is > > inside CONFIG_PM. So when CONFIG_PM=n we get a "defined but not used" > > warning for e1000e_disable_aspm_locked(). > > > > Move it inside the existing CONFIG_PM block to avoid the warning. > > > > Signed-off-by: Michael Ellerman > > --- > > drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > NACK, this is already fixed in my next-queue tree. Raanan submitted a > patch back on July 6th to resolve this issue, see commit id > a75787d2246a93d256061db602f252703559af65 in my dev-queue branch of my > next-queue tree. OK. I take it your next-queue is destined for 4.3, so we'll just have to suck on the warning until then? cheers From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Ellerman Date: Wed, 22 Jul 2015 11:41:20 +1000 Subject: [Intel-wired-lan] [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM In-Reply-To: <1436956216.13597.8.camel@intel.com> References: <1436846075-29366-1-git-send-email-mpe@ellerman.id.au> <1436956216.13597.8.camel@intel.com> Message-ID: <1437529280.16792.9.camel@ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: On Wed, 2015-07-15 at 03:30 -0700, Jeff Kirsher wrote: > On Tue, 2015-07-14 at 13:54 +1000, Michael Ellerman wrote: > > e1000e_disable_aspm_locked() is only used in __e1000_resume() which is > > inside CONFIG_PM. So when CONFIG_PM=n we get a "defined but not used" > > warning for e1000e_disable_aspm_locked(). > > > > Move it inside the existing CONFIG_PM block to avoid the warning. > > > > Signed-off-by: Michael Ellerman > > --- > > drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > NACK, this is already fixed in my next-queue tree. Raanan submitted a > patch back on July 6th to resolve this issue, see commit id > a75787d2246a93d256061db602f252703559af65 in my dev-queue branch of my > next-queue tree. OK. I take it your next-queue is destined for 4.3, so we'll just have to suck on the warning until then? cheers