]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
tpm_tis / PM: Fix unused function warning for CONFIG_PM_SLEEP
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 9 Aug 2012 21:00:35 +0000 (23:00 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Fri, 10 Aug 2012 12:29:50 +0000 (14:29 +0200)
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>
drivers/char/tpm/tpm_tis.c

index 89682fa8801ea0fafb1f8e9556ca148ab0b4f6f9..c4be3519a587c4fe33c3a14be17ba72e6067d9a0 100644 (file)
@@ -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);