From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1042726AbdDUWCZ (ORCPT ); Fri, 21 Apr 2017 18:02:25 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:45812 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1042707AbdDUWCU (ORCPT ); Fri, 21 Apr 2017 18:02:20 -0400 Date: Fri, 21 Apr 2017 15:02:15 -0700 From: Guenter Roeck To: Arnd Bergmann Cc: Mathias Nyman , Greg Kroah-Hartman , Yoshihiro Shimoda , Felipe Balbi , Heikki Krogerus , Baolin Wang , Lu Baolu , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] usb: host: xhci: remove #ifdef around PM functions Message-ID: <20170421220215.GB29008@roeck-us.net> References: <20170421214321.1868547-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170421214321.1868547-1-arnd@arndb.de> User-Agent: Mutt/1.5.24 (2015-08-30) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Authenticated-Sender: bh-25.webhostbox.net: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Apr 21, 2017 at 11:42:54PM +0200, Arnd Bergmann wrote: > The #ifdef is slightly wrong as it doesn't cover the xhci_priv_resume_quirk() > function, causing a harmless warning: > > drivers/usb/host/xhci-plat.c:58:12: error: 'xhci_priv_resume_quirk' defined but not used [-Werror=unused-function] > static int xhci_priv_resume_quirk(struct usb_hcd *hcd) > > A simpler way to do this correctly is to use __maybe_unused annotations > that let the compiler silently drop the functions when there is no > reference. > > Fixes: b0c69b4bace3 ("usb: host: plat: Enable xHCI plat runtime PM") > Signed-off-by: Arnd Bergmann Reviewed-by: Guenter Roeck > --- > drivers/usb/host/xhci-plat.c | 12 ++++-------- > drivers/usb/host/xhci.h | 5 ----- > 2 files changed, 4 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index 057571fab599..7c2a9e7c8e0f 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -355,8 +355,7 @@ static int xhci_plat_remove(struct platform_device *dev) > return 0; > } > > -#ifdef CONFIG_PM_SLEEP > -static int xhci_plat_suspend(struct device *dev) > +static int __maybe_unused xhci_plat_suspend(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > @@ -378,7 +377,7 @@ static int xhci_plat_suspend(struct device *dev) > return ret; > } > > -static int xhci_plat_resume(struct device *dev) > +static int __maybe_unused xhci_plat_resume(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > @@ -393,10 +392,8 @@ static int xhci_plat_resume(struct device *dev) > > return xhci_resume(xhci, 0); > } > -#endif /* CONFIG_PM_SLEEP */ > > -#ifdef CONFIG_PM > -static int xhci_plat_runtime_suspend(struct device *dev) > +static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > @@ -404,14 +401,13 @@ static int xhci_plat_runtime_suspend(struct device *dev) > return xhci_suspend(xhci, true); > } > > -static int xhci_plat_runtime_resume(struct device *dev) > +static int __maybe_unused xhci_plat_runtime_resume(struct device *dev) > { > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > > return xhci_resume(xhci, 0); > } > -#endif /* CONFIG_PM */ > > static const struct dev_pm_ops xhci_plat_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h > index cae8fb901aa8..73a28a986d5e 100644 > --- a/drivers/usb/host/xhci.h > +++ b/drivers/usb/host/xhci.h > @@ -2004,13 +2004,8 @@ void xhci_init_driver(struct hc_driver *drv, > int xhci_disable_slot(struct xhci_hcd *xhci, > struct xhci_command *command, u32 slot_id); > > -#ifdef CONFIG_PM > int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup); > int xhci_resume(struct xhci_hcd *xhci, bool hibernated); > -#else > -#define xhci_suspend NULL > -#define xhci_resume NULL > -#endif > > irqreturn_t xhci_irq(struct usb_hcd *hcd); > irqreturn_t xhci_msi_irq(int irq, void *hcd); > -- > 2.9.0 >