Skip to contentSkip to conversation

ice: mark PM functions as __maybe_unused

PATCH In review Wei Yongjun 2 participants 2 messages Jul 28, 2020 – Jul 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ice: mark PM functions as __maybe_unused

In certain configurations without power management support, the following warnings happen:

drivers/net/ethernet/intel/ice/ice_main.c:4214:12: warning:
'ice_resume' defined but not used [-Wunused-function] 4214 | static int ice_resume(struct device *dev)

      |            ^~~~~~~~~~
drivers/net/ethernet/intel/ice/ice_main.c:4150:12: warning:
 'ice_suspend' defined but not used [-Wunused-function]
 4150 | static int ice_suspend(struct device *dev)
      |            ^~~~~~~~~~~

Mark these functions as __maybe_unused to make it clear to the compiler that this is going to happen based on the configuration, which is the standard for these types of functions.

Fixes 769c500dcc1e ("ice: Add advanced power mgmt for WoL")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_main.c +2 -2
index d6981ba34b27..6edf018c4940 100644
@@ -4147,7 +4147,7 @@ static int ice_reinit_interrupt_scheme(struct ice_pf *pf)
  * Power Management callback to quiesce the device and prepare
  * for D3 transition.
  */
-static int ice_suspend(struct device *dev)
+static int __maybe_unused ice_suspend(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 	struct ice_pf *pf;
@@ -4211,7 +4211,7 @@ static int ice_suspend(struct device *dev)
  * ice_resume - PM callback for waking up from D3
  * @dev: generic device information structure
  */
-static int ice_resume(struct device *dev)
+static int __maybe_unused ice_resume(struct device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev);
 	enum ice_reset_req reset_type;
Tested-by on v1 1/1
#1 lore raw
Quoted 31 lines

-----Original Message-----
From: Intel-wired-lan <[email protected]> On Behalf Of Wei Yongjun
Sent: Monday, July 27, 2020 6:42 PM
To: Hulk Robot <[email protected]>; Kirsher, Jeffrey T <[email protected]>; Jakub Kicinski <[email protected]>; Alexei Starovoitov <[email protected]>; Daniel Borkmann <[email protected]>; Jesper Dangaard Brouer <[email protected]>; John Fastabend <[email protected]>; Abodunrin, Akeem G <[email protected]>
Cc: intel-wired-lan at lists.osuosl.org; Wei Yongjun <[email protected]>; netdev at vger.kernel.org
Subject: [Intel-wired-lan] [PATCH net-next] ice: mark PM functions as __maybe_unused

In certain configurations without power management support, the following warnings happen:

drivers/net/ethernet/intel/ice/ice_main.c:4214:12: warning:
'ice_resume' defined but not used [-Wunused-function] 4214 | static int ice_resume(struct device *dev)

      |            ^~~~~~~~~~
drivers/net/ethernet/intel/ice/ice_main.c:4150:12: warning:
 'ice_suspend' defined but not used [-Wunused-function]
 4150 | static int ice_suspend(struct device *dev)
      |            ^~~~~~~~~~~

Mark these functions as __maybe_unused to make it clear to the compiler that this is going to happen based on the configuration, which is the standard for these types of functions.

Quoted 6 lines
Fixes 769c500dcc1e ("ice: Add advanced power mgmt for WoL")
---
 drivers/net/ethernet/intel/ice/ice_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)