From: Guenter Roeck <linux@roeck-us.net>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Felipe Balbi <balbi@ti.com>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>,
Baolin Wang <baolin.wang@linaro.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] usb: host: xhci: remove #ifdef around PM functions
Date: Fri, 21 Apr 2017 15:02:15 -0700 [thread overview]
Message-ID: <20170421220215.GB29008@roeck-us.net> (raw)
In-Reply-To: <20170421214321.1868547-1-arnd@arndb.de>
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 <arnd@arndb.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> 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
>
next prev parent reply other threads:[~2017-04-21 22:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 21:42 Arnd Bergmann
2017-04-21 22:02 ` Guenter Roeck [this message]
2017-04-26 20:55 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421220215.GB29008@roeck-us.net \
--to=linux@roeck-us.net \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=baolin.wang@linaro.org \
--cc=baolu.lu@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®