Commit 254d152a authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jeff Kirsher

i40e: mark PM functions as __maybe_unused

A cleanup of the PM code left an incorrect #ifdef in place, leading
to a harmless build warning:

drivers/net/ethernet/intel/i40e/i40e_main.c:12223:12: error: 'i40e_resume' defined but not used [-Werror=unused-function]
drivers/net/ethernet/intel/i40e/i40e_main.c:12185:12: error: 'i40e_suspend' defined but not used [-Werror=unused-function]

It's easier to use __maybe_unused attributes here, since you
can't pick the wrong one.

Fixes: 0e5d3da4 ("i40e: use newer generic PM support instead of legacy PM callbacks")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Acked-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent aa2bc739
...@@ -9557,7 +9557,6 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf) ...@@ -9557,7 +9557,6 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf)
return 0; return 0;
} }
#ifdef CONFIG_PM
/** /**
* i40e_restore_interrupt_scheme - Restore the interrupt scheme * i40e_restore_interrupt_scheme - Restore the interrupt scheme
* @pf: private board data structure * @pf: private board data structure
...@@ -9606,7 +9605,6 @@ static int i40e_restore_interrupt_scheme(struct i40e_pf *pf) ...@@ -9606,7 +9605,6 @@ static int i40e_restore_interrupt_scheme(struct i40e_pf *pf)
return err; return err;
} }
#endif /* CONFIG_PM */
/** /**
* i40e_setup_misc_vector - Setup the misc vector to handle non queue events * i40e_setup_misc_vector - Setup the misc vector to handle non queue events
...@@ -13285,12 +13283,11 @@ static void i40e_shutdown(struct pci_dev *pdev) ...@@ -13285,12 +13283,11 @@ static void i40e_shutdown(struct pci_dev *pdev)
} }
} }
#ifdef CONFIG_PM
/** /**
* i40e_suspend - PM callback for moving to D3 * i40e_suspend - PM callback for moving to D3
* @dev: generic device information structure * @dev: generic device information structure
**/ **/
static int i40e_suspend(struct device *dev) static int __maybe_unused i40e_suspend(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct i40e_pf *pf = pci_get_drvdata(pdev); struct i40e_pf *pf = pci_get_drvdata(pdev);
...@@ -13328,7 +13325,7 @@ static int i40e_suspend(struct device *dev) ...@@ -13328,7 +13325,7 @@ static int i40e_suspend(struct device *dev)
* i40e_resume - PM callback for waking up from D3 * i40e_resume - PM callback for waking up from D3
* @dev: generic device information structure * @dev: generic device information structure
**/ **/
static int i40e_resume(struct device *dev) static int __maybe_unused i40e_resume(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct i40e_pf *pf = pci_get_drvdata(pdev); struct i40e_pf *pf = pci_get_drvdata(pdev);
...@@ -13360,8 +13357,6 @@ static int i40e_resume(struct device *dev) ...@@ -13360,8 +13357,6 @@ static int i40e_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM */
static const struct pci_error_handlers i40e_err_handler = { static const struct pci_error_handlers i40e_err_handler = {
.error_detected = i40e_pci_error_detected, .error_detected = i40e_pci_error_detected,
.slot_reset = i40e_pci_error_slot_reset, .slot_reset = i40e_pci_error_slot_reset,
...@@ -13377,11 +13372,9 @@ static struct pci_driver i40e_driver = { ...@@ -13377,11 +13372,9 @@ static struct pci_driver i40e_driver = {
.id_table = i40e_pci_tbl, .id_table = i40e_pci_tbl,
.probe = i40e_probe, .probe = i40e_probe,
.remove = i40e_remove, .remove = i40e_remove,
#ifdef CONFIG_PM
.driver = { .driver = {
.pm = &i40e_pm_ops, .pm = &i40e_pm_ops,
}, },
#endif /* CONFIG_PM */
.shutdown = i40e_shutdown, .shutdown = i40e_shutdown,
.err_handler = &i40e_err_handler, .err_handler = &i40e_err_handler,
.sriov_configure = i40e_pci_sriov_configure, .sriov_configure = i40e_pci_sriov_configure,
......
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