netdev - RE: [Intel-wired-lan] [PATCH] fm10k: mark PM functions as __maybe_unused

Open Source and information security mailing list archives

Message-ID: <EF50CC0C76A53A44BAD798C58E0A157E64B17517@ORSMSX103.amr.corp.intel.com>
Date:   Tue, 28 Nov 2017 18:51:26 +0000
From:   "Singh, Krishneil K" <krishneil.k.singh@...el.com>
To:     "Keller, Jacob E" <jacob.e.keller@...el.com>,
        Arnd Bergmann <arnd@...db.de>,
        "Kirsher, Jeffrey T" <jeffrey.t.kirsher@...el.com>
CC:     "Kwan, Ngai-mint" <ngai-mint.kwan@...el.com>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
        Florian Westphal <fw@...len.de>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "intel-wired-lan@...ts.osuosl.org" <intel-wired-lan@...ts.osuosl.org>,
        "David S. Miller" <davem@...emloft.net>
Subject: RE: [Intel-wired-lan] [PATCH] fm10k: mark PM functions as
        __maybe_unused


> -----Original Message-----
> From: Intel-wired-lan [mailto:intel-wired-lan-bounces@...osl.org] On Behalf
> Of Keller, Jacob E
> Sent: Wednesday, October 11, 2017 3:20 PM
> To: Arnd Bergmann <arnd@...db.de>; Kirsher, Jeffrey T
> <jeffrey.t.kirsher@...el.com>
> Cc: Kwan, Ngai-mint <ngai-mint.kwan@...el.com>; netdev@...r.kernel.org;
> Florian Westphal <fw@...len.de>; linux-kernel@...r.kernel.org; intel-wired-
> lan@...ts.osuosl.org; David S. Miller <davem@...emloft.net>
> Subject: Re: [Intel-wired-lan] [PATCH] fm10k: mark PM functions as
> __maybe_unused
> 
> 
> 
> > -----Original Message-----
> > From: Arnd Bergmann [mailto:arnd@...db.de]
> > Sent: Wednesday, October 11, 2017 6:58 AM
> > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@...el.com>
> > Cc: Arnd Bergmann <arnd@...db.de>; Keller, Jacob E
> > <jacob.e.keller@...el.com>; Kwan, Ngai-mint <ngai-mint.kwan@...el.com>;
> > David S. Miller <davem@...emloft.net>; Florian Westphal <fw@...len.de>;
> > intel-wired-lan@...ts.osuosl.org; netdev@...r.kernel.org; linux-
> > kernel@...r.kernel.org
> > Subject: [PATCH] fm10k: 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/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.
> >
> 
> Acked-by: Jacob Keller <jacob.e.keller@...el.com>
> 
> > Fixes: 8249c47c6ba4 ("fm10k: use generic PM hooks instead of legacy PCIe
> power
> > hooks")
> > Signed-off-by: Arnd Bergmann <arnd@...db.de>
> > ---
> >  drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
> > index 1e9ae3197b17..52f8eb3c470e 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
> >  };
> > --
> > 2.9.0
> 
> _______________________________________________
> Intel-wired-lan mailing list
> Intel-wired-lan@...osl.org
> https://lists.osuosl.org/mailman/listinfo/intel-wired-lan

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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives