Revert "HACK: tpm: Add tpm_ignore_suspend_errors debugfs file"

This reverts commit 50d6900e931871224fb718c3b87e9a614a8dbf94.

With the TPM issues fixed from the rtc change, this hack is no longer
needed.

BUG=chrome-os-partner:14804
TEST=boot kernel, see sysfs file gone.  suspend/resume on snow

Change-Id: Ia9fae9a522387a1082dae825bd9c18a6bd8922bf
Signed-off-by: Jonathan Kliegman <kliegs@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/39000
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

diff --git a/drivers/char/tpm/tpm_tis_i2c.c b/drivers/char/tpm/tpm_tis_i2c.c
index cfb5641934b142a3a0cf01d4dcd2a45d8cce643a..393973358fc8de34a0f55dabdffb744e44eaee5e 100644 (file)
--- a/drivers/char/tpm/tpm_tis_i2c.c
+++ b/drivers/char/tpm/tpm_tis_i2c.c
@@ -24,7 +24,6 @@
  * but works fine on Beagleboard (ARM OMAP).
  *
  */
-#include <linux/debugfs.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
@@ -62,8 +61,6 @@ struct tpm_inf_dev {
        struct tpm_chip *chip;
        bool powered_while_suspended;
        struct work_struct init_work;
-       u32 ignore_suspend_errors; /* debugfs_create_bool expects u32 */
-       struct dentry *debugfs_entry;
 };
 
 static struct tpm_inf_dev tpm_dev;
@@ -628,9 +625,6 @@ static int tpm_tis_i2c_init(struct device *dev)
                tpm_dev.powered_while_suspended = true;
        }
 
-       tpm_dev.debugfs_entry = debugfs_create_bool("tpm_ignore_suspend_errors",
-                                                   0644, NULL,
-                                                   &tpm_dev.ignore_suspend_errors);
        return 0;
 
 out_release:
@@ -663,22 +657,10 @@ MODULE_DEVICE_TABLE(i2c, tpm_i2c_id);
  */
 static int tpm_tis_i2c_suspend(struct device *dev)
 {
-       int ret;
-
        if (tpm_dev.powered_while_suspended)
                return 0;
 
-       ret = tpm_pm_suspend(dev, dev->power.power_state);
-       if (tpm_dev.ignore_suspend_errors) {
-               if (ret) {
-                       struct tpm_chip *chip = dev_get_drvdata(dev);
-                       dev_warn(chip->dev, "Ignoring TPM suspend error: %d\n",
-                                ret);
-               }
-               return 0;
-       } else {
-               return ret;
-       }
+       return tpm_pm_suspend(dev, dev->power.power_state);
 }
 
 #define TPM_TAG_RQU_COMMAND cpu_to_be16(193)
@@ -754,11 +736,6 @@ static int __devinit tpm_tis_i2c_probe(struct i2c_client *client,
 static void __exit cleanup_tis_i2c(void)
 {
        struct tpm_chip *chip = tpm_dev.chip;
-
-       if (tpm_dev.debugfs_entry) {
-               debugfs_remove(tpm_dev.debugfs_entry);
-               tpm_dev.debugfs_entry = NULL;
-       }
        release_locality(chip, chip->vendor.locality, 1);
 
        cancel_work_sync(&tpm_dev.init_work);