From: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
Felipe Balbi <balbi-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Alan Stern
<stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Mathias Nyman
<mathias.nyman-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>,
linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH 2/6] usb: xhci-mtk: use __maybe_unused to hide pm functions
Date: Fri, 4 Mar 2016 17:33:50 +0100 [thread overview]
Message-ID: <56D9B8EE.3060107@gmail.com> (raw)
In-Reply-To: <1456932255-71725-3-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
On 02/03/16 16:24, Arnd Bergmann wrote:
> The mediatek XHCI glue driver uses SET_SYSTEM_SLEEP_PM_OPS() to
> conditionally set the correct suspend/resume options, and
> also puts both the dev_pm_ops and the functions inside of
> an #ifdef testing for CONFIG_PM_SLEEP, but those functions
> then call other code that becomes unused:
>
> drivers/usb/host/xhci-mtk.c:135:12: error: 'xhci_mtk_host_disable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:313:13: error: 'usb_wakeup_enable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:321:13: error: 'usb_wakeup_disable' defined but not used [-Werror=unused-function]
>
> This replaces the #ifdef with __maybe_unused annotations so the
> compiler knows it can silently drop them instead of warning.
>
> For the DEV_PM_OPS definition, we can use an IS_ENABLED() check
> to avoid defining the structure when CONFIG_PM is not set without
> the #ifdef.
>
> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
> ---
Reviewed-by: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> drivers/usb/host/xhci-mtk.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
> index 9532f5aef71b..79959f17c38c 100644
> --- a/drivers/usb/host/xhci-mtk.c
> +++ b/drivers/usb/host/xhci-mtk.c
> @@ -695,7 +695,6 @@ static int xhci_mtk_remove(struct platform_device *dev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> /*
> * if ip sleep fails, and all clocks are disabled, access register will hang
> * AHB bus, so stop polling roothubs to avoid regs access on bus suspend.
> @@ -703,7 +702,7 @@ static int xhci_mtk_remove(struct platform_device *dev)
> * to wake up system immediately after system suspend complete if ip sleep
> * fails, it is what we wanted.
> */
> -static int xhci_mtk_suspend(struct device *dev)
> +static int __maybe_unused xhci_mtk_suspend(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -722,7 +721,7 @@ static int xhci_mtk_suspend(struct device *dev)
> return 0;
> }
>
> -static int xhci_mtk_resume(struct device *dev)
> +static int __maybe_unused xhci_mtk_resume(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -744,10 +743,7 @@ static int xhci_mtk_resume(struct device *dev)
> static const struct dev_pm_ops xhci_mtk_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(xhci_mtk_suspend, xhci_mtk_resume)
> };
> -#define DEV_PM_OPS (&xhci_mtk_pm_ops)
> -#else
> -#define DEV_PM_OPS NULL
> -#endif /* CONFIG_PM */
> +#define DEV_PM_OPS IS_ENABLED(CONFIG_PM) ? &xhci_mtk_pm_ops : NULL
>
> #ifdef CONFIG_OF
> static const struct of_device_id mtk_xhci_of_match[] = {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: matthias.bgg@gmail.com (Matthias Brugger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/6] usb: xhci-mtk: use __maybe_unused to hide pm functions
Date: Fri, 4 Mar 2016 17:33:50 +0100 [thread overview]
Message-ID: <56D9B8EE.3060107@gmail.com> (raw)
In-Reply-To: <1456932255-71725-3-git-send-email-arnd@arndb.de>
On 02/03/16 16:24, Arnd Bergmann wrote:
> The mediatek XHCI glue driver uses SET_SYSTEM_SLEEP_PM_OPS() to
> conditionally set the correct suspend/resume options, and
> also puts both the dev_pm_ops and the functions inside of
> an #ifdef testing for CONFIG_PM_SLEEP, but those functions
> then call other code that becomes unused:
>
> drivers/usb/host/xhci-mtk.c:135:12: error: 'xhci_mtk_host_disable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:313:13: error: 'usb_wakeup_enable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:321:13: error: 'usb_wakeup_disable' defined but not used [-Werror=unused-function]
>
> This replaces the #ifdef with __maybe_unused annotations so the
> compiler knows it can silently drop them instead of warning.
>
> For the DEV_PM_OPS definition, we can use an IS_ENABLED() check
> to avoid defining the structure when CONFIG_PM is not set without
> the #ifdef.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> drivers/usb/host/xhci-mtk.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
> index 9532f5aef71b..79959f17c38c 100644
> --- a/drivers/usb/host/xhci-mtk.c
> +++ b/drivers/usb/host/xhci-mtk.c
> @@ -695,7 +695,6 @@ static int xhci_mtk_remove(struct platform_device *dev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> /*
> * if ip sleep fails, and all clocks are disabled, access register will hang
> * AHB bus, so stop polling roothubs to avoid regs access on bus suspend.
> @@ -703,7 +702,7 @@ static int xhci_mtk_remove(struct platform_device *dev)
> * to wake up system immediately after system suspend complete if ip sleep
> * fails, it is what we wanted.
> */
> -static int xhci_mtk_suspend(struct device *dev)
> +static int __maybe_unused xhci_mtk_suspend(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -722,7 +721,7 @@ static int xhci_mtk_suspend(struct device *dev)
> return 0;
> }
>
> -static int xhci_mtk_resume(struct device *dev)
> +static int __maybe_unused xhci_mtk_resume(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -744,10 +743,7 @@ static int xhci_mtk_resume(struct device *dev)
> static const struct dev_pm_ops xhci_mtk_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(xhci_mtk_suspend, xhci_mtk_resume)
> };
> -#define DEV_PM_OPS (&xhci_mtk_pm_ops)
> -#else
> -#define DEV_PM_OPS NULL
> -#endif /* CONFIG_PM */
> +#define DEV_PM_OPS IS_ENABLED(CONFIG_PM) ? &xhci_mtk_pm_ops : NULL
>
> #ifdef CONFIG_OF
> static const struct of_device_id mtk_xhci_of_match[] = {
>
WARNING: multiple messages have this Message-ID (diff)
From: Matthias Brugger <matthias.bgg@gmail.com>
To: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-arm-kernel@lists.infradead.org,
Felipe Balbi <balbi@kernel.org>,
Alan Stern <stern@rowland.harvard.edu>,
linux-usb@vger.kernel.org,
Mathias Nyman <mathias.nyman@intel.com>,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/6] usb: xhci-mtk: use __maybe_unused to hide pm functions
Date: Fri, 4 Mar 2016 17:33:50 +0100 [thread overview]
Message-ID: <56D9B8EE.3060107@gmail.com> (raw)
In-Reply-To: <1456932255-71725-3-git-send-email-arnd@arndb.de>
On 02/03/16 16:24, Arnd Bergmann wrote:
> The mediatek XHCI glue driver uses SET_SYSTEM_SLEEP_PM_OPS() to
> conditionally set the correct suspend/resume options, and
> also puts both the dev_pm_ops and the functions inside of
> an #ifdef testing for CONFIG_PM_SLEEP, but those functions
> then call other code that becomes unused:
>
> drivers/usb/host/xhci-mtk.c:135:12: error: 'xhci_mtk_host_disable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:313:13: error: 'usb_wakeup_enable' defined but not used [-Werror=unused-function]
> drivers/usb/host/xhci-mtk.c:321:13: error: 'usb_wakeup_disable' defined but not used [-Werror=unused-function]
>
> This replaces the #ifdef with __maybe_unused annotations so the
> compiler knows it can silently drop them instead of warning.
>
> For the DEV_PM_OPS definition, we can use an IS_ENABLED() check
> to avoid defining the structure when CONFIG_PM is not set without
> the #ifdef.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Reviewed-by: Matthias Brugger <matthias.bgg@gmail.com>
> drivers/usb/host/xhci-mtk.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci-mtk.c
> index 9532f5aef71b..79959f17c38c 100644
> --- a/drivers/usb/host/xhci-mtk.c
> +++ b/drivers/usb/host/xhci-mtk.c
> @@ -695,7 +695,6 @@ static int xhci_mtk_remove(struct platform_device *dev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP
> /*
> * if ip sleep fails, and all clocks are disabled, access register will hang
> * AHB bus, so stop polling roothubs to avoid regs access on bus suspend.
> @@ -703,7 +702,7 @@ static int xhci_mtk_remove(struct platform_device *dev)
> * to wake up system immediately after system suspend complete if ip sleep
> * fails, it is what we wanted.
> */
> -static int xhci_mtk_suspend(struct device *dev)
> +static int __maybe_unused xhci_mtk_suspend(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -722,7 +721,7 @@ static int xhci_mtk_suspend(struct device *dev)
> return 0;
> }
>
> -static int xhci_mtk_resume(struct device *dev)
> +static int __maybe_unused xhci_mtk_resume(struct device *dev)
> {
> struct xhci_hcd_mtk *mtk = dev_get_drvdata(dev);
> struct usb_hcd *hcd = mtk->hcd;
> @@ -744,10 +743,7 @@ static int xhci_mtk_resume(struct device *dev)
> static const struct dev_pm_ops xhci_mtk_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(xhci_mtk_suspend, xhci_mtk_resume)
> };
> -#define DEV_PM_OPS (&xhci_mtk_pm_ops)
> -#else
> -#define DEV_PM_OPS NULL
> -#endif /* CONFIG_PM */
> +#define DEV_PM_OPS IS_ENABLED(CONFIG_PM) ? &xhci_mtk_pm_ops : NULL
>
> #ifdef CONFIG_OF
> static const struct of_device_id mtk_xhci_of_match[] = {
>
next prev parent reply other threads:[~2016-03-04 16:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-02 15:24 usb: avoid warnings for unused pm functions Arnd Bergmann
2016-03-02 15:24 ` [PATCH 1/6] usb: host: unhide suspend/resume declarations Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
2016-03-02 15:58 ` Alan Stern
2016-03-02 15:58 ` Alan Stern
2016-03-02 15:24 ` [PATCH 2/6] usb: xhci-mtk: use __maybe_unused to hide pm functions Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
[not found] ` <1456932255-71725-3-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2016-03-04 16:33 ` Matthias Brugger [this message]
2016-03-04 16:33 ` Matthias Brugger
2016-03-04 16:33 ` Matthias Brugger
[not found] ` <56D9B8EE.3060107-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-03-10 11:42 ` Mathias Nyman
2016-03-10 11:42 ` Mathias Nyman
2016-03-10 11:42 ` Mathias Nyman
2016-03-02 15:24 ` [PATCH 3/6] usb: ohci-at91: " Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
2016-03-02 15:34 ` Nicolas Ferre
2016-03-02 15:34 ` Nicolas Ferre
2016-03-02 15:24 ` [PATCH 4/6] usb: ehci-atmel: " Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
2016-03-02 15:34 ` Nicolas Ferre
2016-03-02 15:34 ` Nicolas Ferre
2016-03-02 15:24 ` [PATCH 5/6] phy: dm816x: " Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
2016-03-02 15:24 ` [PATCH 6/6] phy: twl4030: " Arnd Bergmann
2016-03-02 15:24 ` Arnd Bergmann
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=56D9B8EE.3060107@gmail.com \
--to=matthias.bgg-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=balbi-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=mathias.nyman-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.