diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-09 23:00:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-08-10 14:29:50 +0200 |
| commit | 07368d32f1a67e797def08cf2ee3ea1647b204b6 (patch) | |
| tree | f73b3d89ae6358eb775def3366ccf487016046dc | |
| parent | 3567a4e2c52ce2f6fe74fc85690335ec7c96608e (diff) | |
| download | linux-3.10-07368d32f1a67e797def08cf2ee3ea1647b204b6.tar.gz linux-3.10-07368d32f1a67e797def08cf2ee3ea1647b204b6.tar.bz2 linux-3.10-07368d32f1a67e797def08cf2ee3ea1647b204b6.zip | |
tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP
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 <rjw@sisk.pl>
| -rw-r--r-- | drivers/char/tpm/tpm_tis.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 89682fa8801..c4be3519a58 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); |