From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dave Hansen <dave@sr71.net>
Date: Mon, 28 Sep 2015 08:57:18 -0700
Subject: [Intel-wired-lan] [PATCH] e1000: fix
	e1000e_disable_aspm_locked() warning
In-Reply-To: <20150831212641.FA5D579A@viggo.jf.intel.com>
References: <20150831212641.FA5D579A@viggo.jf.intel.com>
Message-ID: <5609635E.6010907@sr71.net>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: intel-wired-lan@osuosl.org
List-ID: <intel-wired-lan.osuosl.org>

On 08/31/2015 02:26 PM, Dave Hansen wrote:
> From: Dave Hansen <dave.hansen@linux.intel.com>
> 
> I have a .config with CONFIG_PM disabled.  I get the following whenever
> compiling the e1000 driver:
> 
> ...net/ethernet/intel/e1000e/netdev.c:6450:13: warning: 'e1000e_disable_aspm_locked' defined but not used [-Wunused-function]
>  static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)
> 
> Looks like we just need to move e1000e_disable_aspm_locked() to
> be underneath the CONFIG_PM #ifdef.

This patch:

	[2758f9edb]: e1000e: Fix incorrect ASPM locking

established a new caller for e1000e_disable_aspm_locked() which makes my
patch useless and wrong (it breaks the compile).

I believe we should just revert my patch.

From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S934314AbbI1P5Y (ORCPT <rfc822;w@1wt.eu>);
	Mon, 28 Sep 2015 11:57:24 -0400
Received: from www.sr71.net ([198.145.64.142]:33950 "EHLO blackbird.sr71.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S934249AbbI1P5X (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 28 Sep 2015 11:57:23 -0400
Subject: Re: [PATCH] e1000: fix e1000e_disable_aspm_locked() warning
Cc: dave.hansen@linux.intel.com, jeffrey.t.kirsher@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, intel-wired-lan@lists.osuosl.org,
        netdev@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20150831212641.FA5D579A@viggo.jf.intel.com>
From: Dave Hansen <dave@sr71.net>
To: raanan.avargil@intel.com
Message-ID: <5609635E.6010907@sr71.net>
Date: Mon, 28 Sep 2015 08:57:18 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.2.0
MIME-Version: 1.0
In-Reply-To: <20150831212641.FA5D579A@viggo.jf.intel.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 08/31/2015 02:26 PM, Dave Hansen wrote:
> From: Dave Hansen <dave.hansen@linux.intel.com>
> 
> I have a .config with CONFIG_PM disabled.  I get the following whenever
> compiling the e1000 driver:
> 
> ...net/ethernet/intel/e1000e/netdev.c:6450:13: warning: 'e1000e_disable_aspm_locked' defined but not used [-Wunused-function]
>  static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)
> 
> Looks like we just need to move e1000e_disable_aspm_locked() to
> be underneath the CONFIG_PM #ifdef.

This patch:

	[2758f9edb]: e1000e: Fix incorrect ASPM locking

established a new caller for e1000e_disable_aspm_locked() which makes my
patch useless and wrong (it breaks the compile).

I believe we should just revert my patch.