From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: Re: [PATCH] tpm/tpm_crb: mark PM functions as __maybe_unused
Date: Wed, 22 Mar 2017 12:21:23 +0200 [thread overview]
Message-ID: <20170322102123.7ssqn5v4ulklsg5r@intel.com> (raw)
In-Reply-To: <20170320091755.1043811-1-arnd-r2nGTMty4D4@public.gmane.org>
On Mon, Mar 20, 2017 at 10:17:19AM +0100, Arnd Bergmann wrote:
> When CONFIG_PM_SLEEP is disabled, we get a warning about unused functions:
>
> drivers/char/tpm/tpm_crb.c:551:12: error: 'crb_pm_resume' defined but not used [-Werror=unused-function]
> drivers/char/tpm/tpm_crb.c:540:12: error: 'crb_pm_suspend' defined but not used [-Werror=unused-function]
>
> We could solve this with more sophistated #ifdefs, but a simpler and safer
> way is to just mark them as __maybe_unused.
>
> Fixes: 848efcfb560c ("tpm/tpm_crb: enter the low power state upon device suspend")
> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>
Hi, I somehow missed this and applied very similar patch. Sorry about
that.
/Jarkko
> ---
> drivers/char/tpm/tpm_crb.c | 11 ++++-------
> 1 file changed, 4 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
> index 1dfc37e33c02..15f1118982a6 100644
> --- a/drivers/char/tpm/tpm_crb.c
> +++ b/drivers/char/tpm/tpm_crb.c
> @@ -519,8 +519,7 @@ static int crb_acpi_remove(struct acpi_device *device)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> -static int crb_pm_runtime_suspend(struct device *dev)
> +static __maybe_unused int crb_pm_runtime_suspend(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
> struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> @@ -528,7 +527,7 @@ static int crb_pm_runtime_suspend(struct device *dev)
> return crb_go_idle(dev, priv);
> }
>
> -static int crb_pm_runtime_resume(struct device *dev)
> +static __maybe_unused int crb_pm_runtime_resume(struct device *dev)
> {
> struct tpm_chip *chip = dev_get_drvdata(dev);
> struct crb_priv *priv = dev_get_drvdata(&chip->dev);
> @@ -536,7 +535,7 @@ static int crb_pm_runtime_resume(struct device *dev)
> return crb_cmd_ready(dev, priv);
> }
>
> -static int crb_pm_suspend(struct device *dev)
> +static __maybe_unused int crb_pm_suspend(struct device *dev)
> {
> int ret;
>
> @@ -547,7 +546,7 @@ static int crb_pm_suspend(struct device *dev)
> return crb_pm_runtime_suspend(dev);
> }
>
> -static int crb_pm_resume(struct device *dev)
> +static __maybe_unused int crb_pm_resume(struct device *dev)
> {
> int ret;
>
> @@ -558,8 +557,6 @@ static int crb_pm_resume(struct device *dev)
> return tpm_pm_resume(dev);
> }
>
> -#endif /* CONFIG_PM */
> -
> static const struct dev_pm_ops crb_pm = {
> SET_SYSTEM_SLEEP_PM_OPS(crb_pm_suspend, crb_pm_resume)
> SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL)
> --
> 2.9.0
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
prev parent reply other threads:[~2017-03-22 10:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 9:17 [PATCH] tpm/tpm_crb: mark PM functions as __maybe_unused Arnd Bergmann
[not found] ` <20170320091755.1043811-1-arnd-r2nGTMty4D4@public.gmane.org>
2017-03-20 12:11 ` Winkler, Tomas
[not found] ` <5B8DA87D05A7694D9FA63FD143655C1B543B032E-Jy8z56yoSI8MvF1YICWikbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-03-20 12:27 ` Arnd Bergmann
[not found] ` <CAK8P3a25sh0U=N9E1pWACL_9h7VBseUBX50WZe5rXMpNHY=GbA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-03-20 23:01 ` Winkler, Tomas
[not found] ` <5B8DA87D05A7694D9FA63FD143655C1B543B0620-Jy8z56yoSI8MvF1YICWikbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-03-20 23:04 ` Jason Gunthorpe
[not found] ` <20170320230430.GA25163-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
2017-03-20 23:35 ` Winkler, Tomas
[not found] ` <5B8DA87D05A7694D9FA63FD143655C1B543B0650-Jy8z56yoSI8MvF1YICWikbfspsVTdybXVpNB7YpNyf8@public.gmane.org>
2017-03-21 7:37 ` Arnd Bergmann
2017-03-22 10:21 ` Jarkko Sakkinen [this message]
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=20170322102123.7ssqn5v4ulklsg5r@intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).