* [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
@ 2017-07-12 21:09 ` Dave Hansen
0 siblings, 0 replies; 8+ messages in thread
From: Dave Hansen @ 2017-07-12 21:09 UTC (permalink / raw)
To: linux-kernel; +Cc: Dave Hansen, jeffrey.t.kirsher, intel-wired-lan, netdev
From: Dave Hansen <dave.hansen@linux.intel.com>
I'm seeing warnings on kernel configurations where CONFIG_PM is
disabled. It happens in 4.12, at least:
drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
This is because igb_deliver_wake_packet() is defined outside of
the #ifdef", but is used only a single time within the #ifdef in
igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
igb_resume() inside the #ifdef.
The diff ends up looking a bit funky here. It *looks* like
igb_suspend() is getting moved, but that's an artifact of how
'diff' sees the changes.
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---
b/drivers/net/ethernet/intel/igb/igb_main.c | 46 ++++++++++++++--------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff -puN drivers/net/ethernet/intel/igb/igb_main.c~undef-igb_deliver_wake_packet drivers/net/ethernet/intel/igb/igb_main.c
--- a/drivers/net/ethernet/intel/igb/igb_main.c~undef-igb_deliver_wake_packet 2017-07-12 14:08:37.205721093 -0700
+++ b/drivers/net/ethernet/intel/igb/igb_main.c 2017-07-12 14:08:37.210721093 -0700
@@ -7985,6 +7985,29 @@ static int __igb_shutdown(struct pci_dev
return 0;
}
+#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
+static int igb_suspend(struct device *dev)
+{
+ int retval;
+ bool wake;
+ struct pci_dev *pdev = to_pci_dev(dev);
+
+ retval = __igb_shutdown(pdev, &wake, 0);
+ if (retval)
+ return retval;
+
+ if (wake) {
+ pci_prepare_to_sleep(pdev);
+ } else {
+ pci_wake_from_d3(pdev, false);
+ pci_set_power_state(pdev, PCI_D3hot);
+ }
+
+ return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
static void igb_deliver_wake_packet(struct net_device *netdev)
{
struct igb_adapter *adapter = netdev_priv(netdev);
@@ -8015,29 +8038,6 @@ static void igb_deliver_wake_packet(stru
netif_rx(skb);
}
-#ifdef CONFIG_PM
-#ifdef CONFIG_PM_SLEEP
-static int igb_suspend(struct device *dev)
-{
- int retval;
- bool wake;
- struct pci_dev *pdev = to_pci_dev(dev);
-
- retval = __igb_shutdown(pdev, &wake, 0);
- if (retval)
- return retval;
-
- if (wake) {
- pci_prepare_to_sleep(pdev);
- } else {
- pci_wake_from_d3(pdev, false);
- pci_set_power_state(pdev, PCI_D3hot);
- }
-
- return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
static int igb_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
_
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
@ 2017-07-12 21:09 ` Dave Hansen
0 siblings, 0 replies; 8+ messages in thread
From: Dave Hansen @ 2017-07-12 21:09 UTC (permalink / raw)
To: intel-wired-lan
From: Dave Hansen <dave.hansen@linux.intel.com>
I'm seeing warnings on kernel configurations where CONFIG_PM is
disabled. It happens in 4.12, at least:
drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
This is because igb_deliver_wake_packet() is defined outside of
the #ifdef", but is used only a single time within the #ifdef in
igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
igb_resume() inside the #ifdef.
The diff ends up looking a bit funky here. It *looks* like
igb_suspend() is getting moved, but that's an artifact of how
'diff' sees the changes.
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: intel-wired-lan at lists.osuosl.org
Cc: netdev at vger.kernel.org
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---
b/drivers/net/ethernet/intel/igb/igb_main.c | 46 ++++++++++++++--------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff -puN drivers/net/ethernet/intel/igb/igb_main.c~undef-igb_deliver_wake_packet drivers/net/ethernet/intel/igb/igb_main.c
--- a/drivers/net/ethernet/intel/igb/igb_main.c~undef-igb_deliver_wake_packet 2017-07-12 14:08:37.205721093 -0700
+++ b/drivers/net/ethernet/intel/igb/igb_main.c 2017-07-12 14:08:37.210721093 -0700
@@ -7985,6 +7985,29 @@ static int __igb_shutdown(struct pci_dev
return 0;
}
+#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
+static int igb_suspend(struct device *dev)
+{
+ int retval;
+ bool wake;
+ struct pci_dev *pdev = to_pci_dev(dev);
+
+ retval = __igb_shutdown(pdev, &wake, 0);
+ if (retval)
+ return retval;
+
+ if (wake) {
+ pci_prepare_to_sleep(pdev);
+ } else {
+ pci_wake_from_d3(pdev, false);
+ pci_set_power_state(pdev, PCI_D3hot);
+ }
+
+ return 0;
+}
+#endif /* CONFIG_PM_SLEEP */
+
static void igb_deliver_wake_packet(struct net_device *netdev)
{
struct igb_adapter *adapter = netdev_priv(netdev);
@@ -8015,29 +8038,6 @@ static void igb_deliver_wake_packet(stru
netif_rx(skb);
}
-#ifdef CONFIG_PM
-#ifdef CONFIG_PM_SLEEP
-static int igb_suspend(struct device *dev)
-{
- int retval;
- bool wake;
- struct pci_dev *pdev = to_pci_dev(dev);
-
- retval = __igb_shutdown(pdev, &wake, 0);
- if (retval)
- return retval;
-
- if (wake) {
- pci_prepare_to_sleep(pdev);
- } else {
- pci_wake_from_d3(pdev, false);
- pci_set_power_state(pdev, PCI_D3hot);
- }
-
- return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
static int igb_resume(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
_
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
2017-07-12 21:09 ` [Intel-wired-lan] " Dave Hansen
@ 2017-07-12 21:23 ` Fabio Estevam
-1 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2017-07-12 21:23 UTC (permalink / raw)
To: Dave Hansen; +Cc: linux-kernel, Jeff Kirsher, intel-wired-lan, netdev
On Wed, Jul 12, 2017 at 6:09 PM, Dave Hansen
<dave.hansen@linux.intel.com> wrote:
>
> From: Dave Hansen <dave.hansen@linux.intel.com>
>
> I'm seeing warnings on kernel configurations where CONFIG_PM is
> disabled. It happens in 4.12, at least:
>
> drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> This is because igb_deliver_wake_packet() is defined outside of
> the #ifdef", but is used only a single time within the #ifdef in
> igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> igb_resume() inside the #ifdef.
>
> The diff ends up looking a bit funky here. It *looks* like
> igb_suspend() is getting moved, but that's an artifact of how
> 'diff' sees the changes.
>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan@lists.osuosl.org
> Cc: netdev@vger.kernel.org
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Seems to be fixed by the following commit in linux-next:
commit 000ba1f2ebf0d6f93b9ae6cfbe5417e66f1b8e8c
Author: Arnd Bergmann <arnd@arndb.de>
Date: Thu Apr 27 21:09:52 2017 +0200
igb: mark PM functions as __maybe_unused
The new wake function is only used by the suspend/resume handlers that
are defined in inside of an #ifdef, which can cause this harmless
warning:
drivers/net/ethernet/intel/igb/igb_main.c:7988:13: warning:
'igb_deliver_wake_packet' defined but not used [-Wunused-function]
Removing the #ifdef, instead using a __maybe_unused annotation
simplifies the code and avoids the warning.
Fixes: b90fa8763560 ("igb: Enable reading of wake up packet")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
@ 2017-07-12 21:23 ` Fabio Estevam
0 siblings, 0 replies; 8+ messages in thread
From: Fabio Estevam @ 2017-07-12 21:23 UTC (permalink / raw)
To: intel-wired-lan
On Wed, Jul 12, 2017 at 6:09 PM, Dave Hansen
<dave.hansen@linux.intel.com> wrote:
>
> From: Dave Hansen <dave.hansen@linux.intel.com>
>
> I'm seeing warnings on kernel configurations where CONFIG_PM is
> disabled. It happens in 4.12, at least:
>
> drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> This is because igb_deliver_wake_packet() is defined outside of
> the #ifdef", but is used only a single time within the #ifdef in
> igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> igb_resume() inside the #ifdef.
>
> The diff ends up looking a bit funky here. It *looks* like
> igb_suspend() is getting moved, but that's an artifact of how
> 'diff' sees the changes.
>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan at lists.osuosl.org
> Cc: netdev at vger.kernel.org
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Seems to be fixed by the following commit in linux-next:
commit 000ba1f2ebf0d6f93b9ae6cfbe5417e66f1b8e8c
Author: Arnd Bergmann <arnd@arndb.de>
Date: Thu Apr 27 21:09:52 2017 +0200
igb: mark PM functions as __maybe_unused
The new wake function is only used by the suspend/resume handlers that
are defined in inside of an #ifdef, which can cause this harmless
warning:
drivers/net/ethernet/intel/igb/igb_main.c:7988:13: warning:
'igb_deliver_wake_packet' defined but not used [-Wunused-function]
Removing the #ifdef, instead using a __maybe_unused annotation
simplifies the code and avoids the warning.
Fixes: b90fa8763560 ("igb: Enable reading of wake up packet")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
2017-07-12 21:09 ` [Intel-wired-lan] " Dave Hansen
@ 2017-07-12 21:37 ` David Miller
-1 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-07-12 21:37 UTC (permalink / raw)
To: dave.hansen; +Cc: linux-kernel, jeffrey.t.kirsher, intel-wired-lan, netdev
From: Dave Hansen <dave.hansen@linux.intel.com>
Date: Wed, 12 Jul 2017 14:09:25 -0700
>
> From: Dave Hansen <dave.hansen@linux.intel.com>
>
> I'm seeing warnings on kernel configurations where CONFIG_PM is
> disabled. It happens in 4.12, at least:
>
> drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> This is because igb_deliver_wake_packet() is defined outside of
> the #ifdef", but is used only a single time within the #ifdef in
> igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> igb_resume() inside the #ifdef.
>
> The diff ends up looking a bit funky here. It *looks* like
> igb_suspend() is getting moved, but that's an artifact of how
> 'diff' sees the changes.
>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan@lists.osuosl.org
> Cc: netdev@vger.kernel.org
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
I'll let Jeff queue this up into his tree.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
@ 2017-07-12 21:37 ` David Miller
0 siblings, 0 replies; 8+ messages in thread
From: David Miller @ 2017-07-12 21:37 UTC (permalink / raw)
To: intel-wired-lan
From: Dave Hansen <dave.hansen@linux.intel.com>
Date: Wed, 12 Jul 2017 14:09:25 -0700
>
> From: Dave Hansen <dave.hansen@linux.intel.com>
>
> I'm seeing warnings on kernel configurations where CONFIG_PM is
> disabled. It happens in 4.12, at least:
>
> drivers/ethernet/intel/igb/igb_main.c:7988:13: warning: 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> This is because igb_deliver_wake_packet() is defined outside of
> the #ifdef", but is used only a single time within the #ifdef in
> igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> igb_resume() inside the #ifdef.
>
> The diff ends up looking a bit funky here. It *looks* like
> igb_suspend() is getting moved, but that's an artifact of how
> 'diff' sees the changes.
>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Cc: intel-wired-lan at lists.osuosl.org
> Cc: netdev at vger.kernel.org
> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
I'll let Jeff queue this up into his tree.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
2017-07-12 21:23 ` [Intel-wired-lan] " Fabio Estevam
@ 2017-07-13 22:33 ` Jeff Kirsher
-1 siblings, 0 replies; 8+ messages in thread
From: Jeff Kirsher @ 2017-07-13 22:33 UTC (permalink / raw)
To: Fabio Estevam, Dave Hansen; +Cc: linux-kernel, intel-wired-lan, netdev
[-- Attachment #1: Type: text/plain, Size: 2082 bytes --]
On Wed, 2017-07-12 at 18:23 -0300, Fabio Estevam wrote:
> On Wed, Jul 12, 2017 at 6:09 PM, Dave Hansen
> <dave.hansen@linux.intel.com> wrote:
> >
> > From: Dave Hansen <dave.hansen@linux.intel.com>
> >
> > I'm seeing warnings on kernel configurations where CONFIG_PM is
> > disabled. It happens in 4.12, at least:
> >
> > drivers/ethernet/intel/igb/igb_main.c:7988:13: warning:
> > 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
> >
> > This is because igb_deliver_wake_packet() is defined outside of
> > the #ifdef", but is used only a single time within the #ifdef in
> > igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> > igb_resume() inside the #ifdef.
> >
> > The diff ends up looking a bit funky here. It *looks* like
> > igb_suspend() is getting moved, but that's an artifact of how
> > 'diff' sees the changes.
> >
> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Cc: intel-wired-lan@lists.osuosl.org
> > Cc: netdev@vger.kernel.org
> > Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
>
> Seems to be fixed by the following commit in linux-next:
>
> commit 000ba1f2ebf0d6f93b9ae6cfbe5417e66f1b8e8c
> Author: Arnd Bergmann <arnd@arndb.de>
> Date: Thu Apr 27 21:09:52 2017 +0200
>
> igb: mark PM functions as __maybe_unused
>
> The new wake function is only used by the suspend/resume handlers
> that
> are defined in inside of an #ifdef, which can cause this harmless
> warning:
>
> drivers/net/ethernet/intel/igb/igb_main.c:7988:13: warning:
> 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> Removing the #ifdef, instead using a __maybe_unused annotation
> simplifies the code and avoids the warning.
>
> Fixes: b90fa8763560 ("igb: Enable reading of wake up packet")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Yeah, this is already fixed in my tree. Dropping this patch.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-wired-lan] [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n
@ 2017-07-13 22:33 ` Jeff Kirsher
0 siblings, 0 replies; 8+ messages in thread
From: Jeff Kirsher @ 2017-07-13 22:33 UTC (permalink / raw)
To: intel-wired-lan
On Wed, 2017-07-12 at 18:23 -0300, Fabio Estevam wrote:
> On Wed, Jul 12, 2017 at 6:09 PM, Dave Hansen
> <dave.hansen@linux.intel.com> wrote:
> >
> > From: Dave Hansen <dave.hansen@linux.intel.com>
> >
> > I'm seeing warnings on kernel configurations where CONFIG_PM is
> > disabled. It happens in 4.12, at least:
> >
> > drivers/ethernet/intel/igb/igb_main.c:7988:13: warning:
> > 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
> >
> > This is because igb_deliver_wake_packet() is defined outside of
> > the #ifdef", but is used only a single time within the #ifdef in
> > igb_resume(). Fix it by moving igb_deliver_wake_packet() next to
> > igb_resume() inside the #ifdef.
> >
> > The diff ends up looking a bit funky here. It *looks* like
> > igb_suspend() is getting moved, but that's an artifact of how
> > 'diff' sees the changes.
> >
> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Cc: intel-wired-lan at lists.osuosl.org
> > Cc: netdev at vger.kernel.org
> > Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
>
> Seems to be fixed by the following commit in linux-next:
>
> commit 000ba1f2ebf0d6f93b9ae6cfbe5417e66f1b8e8c
> Author: Arnd Bergmann <arnd@arndb.de>
> Date: Thu Apr 27 21:09:52 2017 +0200
>
> igb: mark PM functions as __maybe_unused
>
> The new wake function is only used by the suspend/resume handlers
> that
> are defined in inside of an #ifdef, which can cause this harmless
> warning:
>
> drivers/net/ethernet/intel/igb/igb_main.c:7988:13: warning:
> 'igb_deliver_wake_packet' defined but not used [-Wunused-function]
>
> Removing the #ifdef, instead using a __maybe_unused annotation
> simplifies the code and avoids the warning.
>
> Fixes: b90fa8763560 ("igb: Enable reading of wake up packet")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Tested-by: Aaron Brown <aaron.f.brown@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Yeah, this is already fixed in my tree. Dropping this patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.osuosl.org/pipermail/intel-wired-lan/attachments/20170713/d6cbf4a1/attachment.asc>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-07-13 22:33 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-12 21:09 [PATCH] igb: fix unused igb_deliver_wake_packet() warning when CONFIG_PM=n Dave Hansen
2017-07-12 21:09 ` [Intel-wired-lan] " Dave Hansen
2017-07-12 21:23 ` Fabio Estevam
2017-07-12 21:23 ` [Intel-wired-lan] " Fabio Estevam
2017-07-13 22:33 ` Jeff Kirsher
2017-07-13 22:33 ` [Intel-wired-lan] " Jeff Kirsher
2017-07-12 21:37 ` David Miller
2017-07-12 21:37 ` [Intel-wired-lan] " David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.