Commit 000ba1f2 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jeff Kirsher

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: b90fa876 ("igb: Enable reading of wake up packet")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 440aeca4
...@@ -191,10 +191,7 @@ static int igb_disable_sriov(struct pci_dev *dev); ...@@ -191,10 +191,7 @@ static int igb_disable_sriov(struct pci_dev *dev);
static int igb_pci_disable_sriov(struct pci_dev *dev); static int igb_pci_disable_sriov(struct pci_dev *dev);
#endif #endif
#ifdef CONFIG_PM
#ifdef CONFIG_PM_SLEEP
static int igb_suspend(struct device *); static int igb_suspend(struct device *);
#endif
static int igb_resume(struct device *); static int igb_resume(struct device *);
static int igb_runtime_suspend(struct device *dev); static int igb_runtime_suspend(struct device *dev);
static int igb_runtime_resume(struct device *dev); static int igb_runtime_resume(struct device *dev);
...@@ -204,7 +201,6 @@ static const struct dev_pm_ops igb_pm_ops = { ...@@ -204,7 +201,6 @@ static const struct dev_pm_ops igb_pm_ops = {
SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume, SET_RUNTIME_PM_OPS(igb_runtime_suspend, igb_runtime_resume,
igb_runtime_idle) igb_runtime_idle)
}; };
#endif
static void igb_shutdown(struct pci_dev *); static void igb_shutdown(struct pci_dev *);
static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs); static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs);
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
...@@ -8015,9 +8011,7 @@ static void igb_deliver_wake_packet(struct net_device *netdev) ...@@ -8015,9 +8011,7 @@ static void igb_deliver_wake_packet(struct net_device *netdev)
netif_rx(skb); netif_rx(skb);
} }
#ifdef CONFIG_PM static int __maybe_unused igb_suspend(struct device *dev)
#ifdef CONFIG_PM_SLEEP
static int igb_suspend(struct device *dev)
{ {
int retval; int retval;
bool wake; bool wake;
...@@ -8036,9 +8030,8 @@ static int igb_suspend(struct device *dev) ...@@ -8036,9 +8030,8 @@ static int igb_suspend(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_SLEEP */
static int igb_resume(struct device *dev) static int __maybe_unused igb_resume(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
...@@ -8092,7 +8085,7 @@ static int igb_resume(struct device *dev) ...@@ -8092,7 +8085,7 @@ static int igb_resume(struct device *dev)
return err; return err;
} }
static int igb_runtime_idle(struct device *dev) static int __maybe_unused igb_runtime_idle(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
...@@ -8104,7 +8097,7 @@ static int igb_runtime_idle(struct device *dev) ...@@ -8104,7 +8097,7 @@ static int igb_runtime_idle(struct device *dev)
return -EBUSY; return -EBUSY;
} }
static int igb_runtime_suspend(struct device *dev) static int __maybe_unused igb_runtime_suspend(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
int retval; int retval;
...@@ -8124,11 +8117,10 @@ static int igb_runtime_suspend(struct device *dev) ...@@ -8124,11 +8117,10 @@ static int igb_runtime_suspend(struct device *dev)
return 0; return 0;
} }
static int igb_runtime_resume(struct device *dev) static int __maybe_unused igb_runtime_resume(struct device *dev)
{ {
return igb_resume(dev); return igb_resume(dev);
} }
#endif /* CONFIG_PM */
static void igb_shutdown(struct pci_dev *pdev) static void igb_shutdown(struct pci_dev *pdev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment