Message ID | 20230428214321.2678571-1-trix@redhat.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 4f163bf82b0244bf4d1e9a6b0f4cf4e90b42496e |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: atlantic: Define aq_pm_ops conditionally on CONFIG_PM | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: On Fri, 28 Apr 2023 17:43:21 -0400 you wrote: > For s390, gcc with W=1 reports > drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c:458:32: error: > 'aq_pm_ops' defined but not used [-Werror=unused-const-variable=] > 458 | static const struct dev_pm_ops aq_pm_ops = { > | ^~~~~~~~~ > > The only use of aq_pm_ops is conditional on CONFIG_PM. > The definition of aq_pm_ops and its functions should also > be conditional on CONFIG_PM. > > [...] Here is the summary with links: - net: atlantic: Define aq_pm_ops conditionally on CONFIG_PM https://git.kernel.org/netdev/net/c/4f163bf82b02 You are awesome, thank you!
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c index 8647125d60ae..baa5f8cc31f2 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c @@ -379,6 +379,7 @@ static void aq_pci_shutdown(struct pci_dev *pdev) } } +#ifdef CONFIG_PM static int aq_suspend_common(struct device *dev) { struct aq_nic_s *nic = pci_get_drvdata(to_pci_dev(dev)); @@ -463,6 +464,7 @@ static const struct dev_pm_ops aq_pm_ops = { .restore = aq_pm_resume_restore, .thaw = aq_pm_thaw, }; +#endif static struct pci_driver aq_pci_ops = { .name = AQ_CFG_DRV_NAME,
For s390, gcc with W=1 reports drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c:458:32: error: 'aq_pm_ops' defined but not used [-Werror=unused-const-variable=] 458 | static const struct dev_pm_ops aq_pm_ops = { | ^~~~~~~~~ The only use of aq_pm_ops is conditional on CONFIG_PM. The definition of aq_pm_ops and its functions should also be conditional on CONFIG_PM. Signed-off-by: Tom Rix <trix@redhat.com> --- drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 ++ 1 file changed, 2 insertions(+)