Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1183335 > unrolled thread
| Started by | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| First post | 2015-07-14 06:00 +0200 |
| Last post | 2015-07-15 12:40 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM Michael Ellerman <mpe@ellerman.id.au> - 2015-07-14 06:00 +0200
Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM Jeff Kirsher <jeffrey.t.kirsher@intel.com> - 2015-07-15 12:40 +0200
| From | Michael Ellerman <mpe@ellerman.id.au> |
|---|---|
| Date | 2015-07-14 06:00 +0200 |
| Subject | [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM |
| Message-ID | <pLZxT-5AN-1@gated-at.bofh.it> |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
|---|---|
| Date | 2015-07-15 12:40 +0200 |
| Subject | Re: [PATCH] e1000e: Move e1000e_disable_aspm_locked() inside CONFIG_PM |
| Message-ID | <pMsgx-4Rv-9@gated-at.bofh.it> |
| In reply to | #1183335 |
[Multipart message — attachments visible in raw view] — view raw
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.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web