Commit 38a529b5 authored by Mika Westerberg's avatar Mika Westerberg Committed by David S. Miller
Browse files

e1000e: Fix compilation warning when !CONFIG_PM_SLEEP

Commit 7509963c

 (e1000e: Fix a compile flag mis-match for
suspend/resume) moved suspend and resume hooks to be available when
CONFIG_PM is set. However, it can be set even if CONFIG_PM_SLEEP is not set
causing following warnings to be emitted:

drivers/net/ethernet/intel/e1000e/netdev.c:6178:12: warning:
  	‘e1000_suspend’ defined but not used [-Wunused-function]

drivers/net/ethernet/intel/e1000e/netdev.c:6185:12: warning:
	‘e1000_resume’ defined but not used [-Wunused-function]

To fix this make the hooks to be available only when CONFIG_PM_SLEEP is set
and remove CONFIG_PM wrapping from driver ops because this is already
Signed-off-by: default avatarMika Westerberg <>
Cc: Dave Ertman <>
Cc: Aaron Brown <>
Cc: Jeff Kirsher <>
Signed-off-by: default avatarDavid S. Miller <>
parent aee636c4
......@@ -6174,7 +6174,7 @@ static int __e1000_resume(struct pci_dev *pdev)
return 0;
#ifdef CONFIG_PM
static int e1000_suspend(struct device *dev)
struct pci_dev *pdev = to_pci_dev(dev);
......@@ -6193,7 +6193,7 @@ static int e1000_resume(struct device *dev)
return __e1000_resume(pdev);
#endif /* CONFIG_PM */
#endif /* CONFIG_PM_SLEEP */
static int e1000_runtime_suspend(struct device *dev)
......@@ -7015,13 +7015,11 @@ static DEFINE_PCI_DEVICE_TABLE(e1000_pci_tbl) = {
MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
#ifdef CONFIG_PM
static const struct dev_pm_ops e1000_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(e1000_suspend, e1000_resume)
SET_RUNTIME_PM_OPS(e1000_runtime_suspend, e1000_runtime_resume,
/* PCI Device API Driver */
static struct pci_driver e1000_driver = {
......@@ -7029,11 +7027,9 @@ static struct pci_driver e1000_driver = {
.id_table = e1000_pci_tbl,
.probe = e1000_probe,
.remove = e1000_remove,
#ifdef CONFIG_PM
.driver = {
.pm = &e1000_pm_ops,
.shutdown = e1000_shutdown,
.err_handler = &e1000_err_handler
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