[tpmdd-devel] tpm/tpm_crb: fix unused warnings on suspend/resume functions

Submitted by Jérémy Lefaure on March 17, 2017, 1:51 a.m.

Details

Message ID 20170317015133.2269-1-jeremy.lefaure@lse.epita.fr
State New
Headers show

Commit Message

Jérémy Lefaure March 17, 2017, 1:51 a.m.
When PM_SLEEP is disabled crb_pm_suspend and crb_pm_resume are not used by
SET_SYSTEM_SLEEP_PM_OPS even if PM is enabled:

drvers/char/tpm/tpm_crb.c:540:12: warning: ‘crb_pm_suspend’ defined but not
used [-Wunused-function]
 static int crb_pm_suspend(struct device *dev)
            ^
drivers/char/tpm/tpm_crb.c:551:12: warning: ‘crb_pm_resume’ defined but not
used [-Wunused-function]
 static int crb_pm_resume(struct device *dev)
            ^

The preprocessor condition should be on CONFIG_PM_SLEEP, not on CONFIG_PM.
However, this patch fixes this warning by using __maybe_unused on function
that are in the preprocessor condition.

Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
---
 drivers/char/tpm/tpm_crb.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Comments

Tomas Winkler March 28, 2017, 6:15 a.m.
> 

> On Tue, Mar 21, 2017 at 10:05:36PM +0000, Winkler, Tomas wrote:

> > > On Thu, Mar 16, 2017 at 09:51:33PM -0400, Jérémy Lefaure wrote:

> > > > When PM_SLEEP is disabled crb_pm_suspend and crb_pm_resume are

> not

> > > > used by SET_SYSTEM_SLEEP_PM_OPS even if PM is enabled:

> > > >

> > > > drvers/char/tpm/tpm_crb.c:540:12: warning: ‘crb_pm_suspend’

> > > > defined but not used [-Wunused-function]  static int

> > > > crb_pm_suspend(struct device *dev)

> > > >             ^

> > > > drivers/char/tpm/tpm_crb.c:551:12: warning: ‘crb_pm_resume’

> > > > defined but not used [-Wunused-function]  static int

> > > > crb_pm_resume(struct device *dev)

> > > >             ^

> > > >

> > > > The preprocessor condition should be on CONFIG_PM_SLEEP, not on

> > > CONFIG_PM.

> > > > However, this patch fixes this warning by using __maybe_unused on

> > > > function that are in the preprocessor condition.

> > > >

> > > > Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>

> > >

> > > Thanks. Please include also linux-kernel@vger.kernel.org in the future.

> > >

> > > Reviewed-by: Jarkko Saskkinen <jarkko.sakkinen@linux.intel.com>

> >

> > We should go with Arnd's patch, which is actually the same,  but it

> > was already reviewed and has better commit messages.

> > Thanks

> > Tomas

> 

> You are right about the commit message but where are the Reviewed-by tags?


Please add mine.

> [1]

> 

> [1] https://patchwork.kernel.org/patch/9633537/

> 

Tomas

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
Jarkko Sakkinen March 28, 2017, 7:35 a.m.
On Tue, Mar 28, 2017 at 06:15:56AM +0000, Winkler, Tomas wrote:
> 
> 
> > 
> > On Tue, Mar 21, 2017 at 10:05:36PM +0000, Winkler, Tomas wrote:
> > > > On Thu, Mar 16, 2017 at 09:51:33PM -0400, Jérémy Lefaure wrote:
> > > > > When PM_SLEEP is disabled crb_pm_suspend and crb_pm_resume are
> > not
> > > > > used by SET_SYSTEM_SLEEP_PM_OPS even if PM is enabled:
> > > > >
> > > > > drvers/char/tpm/tpm_crb.c:540:12: warning: ‘crb_pm_suspend’
> > > > > defined but not used [-Wunused-function]  static int
> > > > > crb_pm_suspend(struct device *dev)
> > > > >             ^
> > > > > drivers/char/tpm/tpm_crb.c:551:12: warning: ‘crb_pm_resume’
> > > > > defined but not used [-Wunused-function]  static int
> > > > > crb_pm_resume(struct device *dev)
> > > > >             ^
> > > > >
> > > > > The preprocessor condition should be on CONFIG_PM_SLEEP, not on
> > > > CONFIG_PM.
> > > > > However, this patch fixes this warning by using __maybe_unused on
> > > > > function that are in the preprocessor condition.
> > > > >
> > > > > Signed-off-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
> > > >
> > > > Thanks. Please include also linux-kernel@vger.kernel.org in the future.
> > > >
> > > > Reviewed-by: Jarkko Saskkinen <jarkko.sakkinen@linux.intel.com>
> > >
> > > We should go with Arnd's patch, which is actually the same,  but it
> > > was already reviewed and has better commit messages.
> > > Thanks
> > > Tomas
> > 
> > You are right about the commit message but where are the Reviewed-by tags?
> 
> Please add mine.
> 
> > [1]
> > 
> > [1] https://patchwork.kernel.org/patch/9633537/
> > 
> Tomas

I'll keep the existing patch at this point as I do not have time to
go through test cycle for another patch. I'm sorry but this came too
late.

/Jarkko

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

Patch hide | download patch | download mbox

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index 324561845dc2..044afb73fdeb 100644
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -520,8 +520,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 int __maybe_unused crb_pm_runtime_suspend(struct device *dev)
 {
 	struct tpm_chip *chip = dev_get_drvdata(dev);
 	struct crb_priv *priv = dev_get_drvdata(&chip->dev);
@@ -529,7 +528,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 int __maybe_unused crb_pm_runtime_resume(struct device *dev)
 {
 	struct tpm_chip *chip = dev_get_drvdata(dev);
 	struct crb_priv *priv = dev_get_drvdata(&chip->dev);
@@ -537,7 +536,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 int __maybe_unused crb_pm_suspend(struct device *dev)
 {
 	int ret;
 
@@ -548,7 +547,7 @@  static int crb_pm_suspend(struct device *dev)
 	return crb_pm_runtime_suspend(dev);
 }
 
-static int crb_pm_resume(struct device *dev)
+static int __maybe_unused crb_pm_resume(struct device *dev)
 {
 	int ret;
 
@@ -559,8 +558,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)