[net] fm10k: mark PM functions as __maybe_unused

Message ID 20180117155732.7289-1-jeffrey.t.kirsher@intel.com
State New
Headers show
Series
  • [net] fm10k: mark PM functions as __maybe_unused
Related show

Commit Message

Jeff Kirsher Jan. 17, 2018, 3:57 p.m.
From: Arnd Bergmann <arnd@arndb.de>


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

drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2502:12: error: 'fm10k_suspend' defined but not used [-Werror=unused-function]
drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2475:12: error: 'fm10k_resume' 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: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe power hooks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Jacob Keller <jacob.e.keller@intel.com>

Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>

Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

---
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
2.15.1

Comments

David Miller Jan. 18, 2018, 8:52 p.m. | #1
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Date: Wed, 17 Jan 2018 07:57:32 -0800

> From: Arnd Bergmann <arnd@arndb.de>

> 

> A cleanup of the PM code left an incorrect #ifdef in place, leading

> to a harmless build warning:

> 

> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2502:12: error: 'fm10k_suspend' defined but not used [-Werror=unused-function]

> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2475:12: error: 'fm10k_resume' 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: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe power hooks")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> Acked-by: Jacob Keller <jacob.e.keller@intel.com>

> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>

> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>


Applied, thanks Arnd.
David Miller Jan. 18, 2018, 9:19 p.m. | #2
From: David Miller <davem@davemloft.net>

Date: Thu, 18 Jan 2018 15:52:38 -0500 (EST)

> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

> Date: Wed, 17 Jan 2018 07:57:32 -0800

> 

>> From: Arnd Bergmann <arnd@arndb.de>

>> 

>> A cleanup of the PM code left an incorrect #ifdef in place, leading

>> to a harmless build warning:

>> 

>> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2502:12: error: 'fm10k_suspend' defined but not used [-Werror=unused-function]

>> drivers/net/ethernet/intel/fm10k/fm10k_pci.c:2475:12: error: 'fm10k_resume' 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: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe power hooks")

>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

>> Acked-by: Jacob Keller <jacob.e.keller@intel.com>

>> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>

>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

> 

> Applied, thanks Arnd.


Of course, thank you to Jeff as well :-)

Patch

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 7f605221a686..a434fecfdfeb 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2463,7 +2463,6 @@  static int fm10k_handle_resume(struct fm10k_intfc *interface)
 	return err;
 }
 
-#ifdef CONFIG_PM
 /**
  * fm10k_resume - Generic PM resume hook
  * @dev: generic device structure
@@ -2472,7 +2471,7 @@  static int fm10k_handle_resume(struct fm10k_intfc *interface)
  * suspend or hibernation. This function does not need to handle lower PCIe
  * device state as the stack takes care of that for us.
  **/
-static int fm10k_resume(struct device *dev)
+static int __maybe_unused fm10k_resume(struct device *dev)
 {
 	struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev));
 	struct net_device *netdev = interface->netdev;
@@ -2499,7 +2498,7 @@  static int fm10k_resume(struct device *dev)
  * system suspend or hibernation. This function does not need to handle lower
  * PCIe device state as the stack takes care of that for us.
  **/
-static int fm10k_suspend(struct device *dev)
+static int __maybe_unused fm10k_suspend(struct device *dev)
 {
 	struct fm10k_intfc *interface = pci_get_drvdata(to_pci_dev(dev));
 	struct net_device *netdev = interface->netdev;
@@ -2511,8 +2510,6 @@  static int fm10k_suspend(struct device *dev)
 	return 0;
 }
 
-#endif /* CONFIG_PM */
-
 /**
  * fm10k_io_error_detected - called when PCI error is detected
  * @pdev: Pointer to PCI device
@@ -2643,11 +2640,9 @@  static struct pci_driver fm10k_driver = {
 	.id_table		= fm10k_pci_tbl,
 	.probe			= fm10k_probe,
 	.remove			= fm10k_remove,
-#ifdef CONFIG_PM
 	.driver = {
 		.pm		= &fm10k_pm_ops,
 	},
-#endif /* CONFIG_PM */
 	.sriov_configure	= fm10k_iov_configure,
 	.err_handler		= &fm10k_err_handler
 };