[PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[Michael Ellerman]

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 <mpe@ellerman.id.au>
---
 drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 89d788d8f263..f1d7fe2ea183 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6439,6 +6439,7 @@ static void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
 	__e1000e_disable_aspm(pdev, state, 0);
 }
 
+#ifdef CONFIG_PM
 /**
  * e1000e_disable_aspm_locked   Disable ASPM states.
  * @pdev: pointer to PCI device struct
@@ -6452,7 +6453,6 @@ static void e1000e_disable_aspm_locked(struct pci_dev *pdev, u16 state)
 	__e1000e_disable_aspm(pdev, state, 1);
 }
 
-#ifdef CONFIG_PM
 static int __e1000_resume(struct pci_dev *pdev)
 {
 	struct net_device *netdev = pci_get_drvdata(pdev);
-- 
2.1.0

Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

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 <mpe@ellerman.id.au>
> ---
>  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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[Michael Ellerman]

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 <mpe@ellerman.id.au>
> > ---
> >  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

Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[Jeff Kirsher]

[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]

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 <mpe@ellerman.id.au>
> > > ---
> > >  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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM

[Michael Ellerman]

On Thu, 2015-07-23 at 07:07 -0700, Jeff Kirsher wrote:
> 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 <mpe@ellerman.id.au>
> > > > ---
> > > >  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.

For 4.2 would be nice, it would make my builds green again. But it's not the
end of the world if it has to wait until 4.3.

cheers