From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753465AbbGWOH5 (ORCPT ); Thu, 23 Jul 2015 10:07:57 -0400 Received: from mga03.intel.com ([134.134.136.65]:25641 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbbGWOHr (ORCPT ); Thu, 23 Jul 2015 10:07:47 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,531,1432623600"; d="asc'?scan'208";a="753105258" Message-ID: <1437660446.23223.3.camel@intel.com> Subject: Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM From: Jeff Kirsher To: Michael Ellerman 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: Thu, 23 Jul 2015 07:07:26 -0700 In-Reply-To: <1437529280.16792.9.camel@ellerman.id.au> References: <1436846075-29366-1-git-send-email-mpe@ellerman.id.au> <1436956216.13597.8.camel@intel.com> <1437529280.16792.9.camel@ellerman.id.au> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-+0vIDSnTgBeQWLf+v2FN" X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) Mime-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-+0vIDSnTgBeQWLf+v2FN Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2015-07-22 at 11:41 +1000, Michael Ellerman wrote: > 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=3Dn we get a "defined but not > used" > > > warning for e1000e_disable_aspm_locked(). > > >=20 > > > Move it inside the existing CONFIG_PM block to avoid the warning. > > >=20 > > > Signed-off-by: Michael Ellerman > > > --- > > > drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > 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. >=20 > OK. I take it your next-queue is destined for 4.3, so we'll just have > to suck > on the warning until then? Yes, but I can queue Raanan's patch up for 4.2 (and possibly stable) if necessary. I have no issue with doing that. --=-+0vIDSnTgBeQWLf+v2FN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJVsPUeAAoJEOVv75VaS+3OM6UP+wSn4BKgC9gOiEaarNpIJ8fx Jbe+K3eTZEsajKxpX8jFYAAkB7p/eHYH4wHenBenaB6BsmMygCk19wa5wAWrY6Ue VzKaUodqbGJ0zCmMappZH8+LU98uW5UFwPGKuDlIanKBtditPBDDxAyVkNKj+1ZX BbMwi/J5Q2hIgE6wzl6DC9jG7zDfYx33RYgcGg5eHiScE+wEMxkOcx/WH6b9dCjI DYMfDxx3KoWh657qFuM/CHSxU0LuAshm+fCSjvj4OypRl5cQvx2pCHEzv4Lujx/V erzyrS7ITwDyInfoP5OAnjj3EGyieIMIIFNU1YYApp6TaiviMqqynUxMXaaEmbli hXvUso4m8qaZdjEK/W20X9mRSVuUMp5OJh5NF32Y+ovfocWweIA1vIIFxAcMq2fy 16jWE794367dcvD9bTtqortQbV3OfC9xJAYlWPPX+Epi32AesGOqfsjTSbbFiLcR hkeObsX3PmzxYbnZJd3lyaRKIKcUasoQf6azFi4Fqe3b+rBZsFrdaoaunTuNI2ih wi1nfccNUpwxl/m5GhB+mLdw/fitUfe7e/9f2hld+xrKP1KQjyM/D2/y6tlbHAa8 NCfwTuD+blRN0lXTmYoDhQ1RSsoSKfjramwHMJX3tlCnJGj9/wr9s3siwCAfS/lc PI5+kGT2+lKgU3Xjc1pF =2dAZ -----END PGP SIGNATURE----- --=-+0vIDSnTgBeQWLf+v2FN-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Date: Thu, 23 Jul 2015 07:07:26 -0700 Subject: [Intel-wired-lan] [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM In-Reply-To: <1437529280.16792.9.camel@ellerman.id.au> References: <1436846075-29366-1-git-send-email-mpe@ellerman.id.au> <1436956216.13597.8.camel@intel.com> <1437529280.16792.9.camel@ellerman.id.au> Message-ID: <1437660446.23223.3.camel@intel.com> 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-22 at 11:41 +1000, Michael Ellerman wrote: > 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? Yes, but I can queue Raanan's patch up for 4.2 (and possibly stable) if necessary. I have no issue with doing that. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: This is a digitally signed message part URL: