projects/linux·commit 07368d32

tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP

07368d32 · Rafael J. Wysocki <[email protected]> · 2012-08-09 23:00:35 +02:00

According to a compiler warning, the tpm_tis_resume() function is not
used for CONFIG_PM_SLEEP unset, so add a #ifdef to prevent it from
being built in that case.

Signed-off-by: Rafael J. Wysocki <[email protected]>
Commit
07368d32f1a67e797def08cf2ee3ea1647b204b6
Parents
3567a4e2

Changes

1 files changed · +2 −0

FileStatusAddDelContent
drivers/char/tpm/tpm_tis.cmodified+2−0View file

drivers/char/tpm/tpm_tis.c

View file
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 89682fa..c4be351 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -807,6 +807,7 @@ module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
#endif
+#ifdef CONFIG_PM_SLEEP
static int tpm_tis_resume(struct device *dev)
{
struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -816,6 +817,7 @@ static int tpm_tis_resume(struct device *dev)
return tpm_pm_resume(dev);
}
+#endif
static SIMPLE_DEV_PM_OPS(tpm_tis_pm, tpm_pm_suspend, tpm_tis_resume);