Revert "tpm/tpm_crb: open code the crb_init into acpi_add"

[cascardo/linux.git] / drivers / char / tpm / tpm_crb.c

diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
index aa0ef74..2d1669c 100644 (file)
--- a/drivers/char/tpm/tpm_crb.c
+++ b/drivers/char/tpm/tpm_crb.c
@@ -19,7 +19,6 @@
 #include <linux/highmem.h>
 #include <linux/rculist.h>
 #include <linux/module.h>
-#include <linux/pm_runtime.h>
 #include "tpm.h"
 
 #define ACPI_SIG_TPM2 "TPM2"
@@ -153,6 +152,8 @@ static int __maybe_unused crb_cmd_ready(struct device *dev,
        return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(crb_pm, tpm_pm_suspend, tpm_pm_resume);
+
 static u8 crb_status(struct tpm_chip *chip)
 {
        struct crb_priv *priv = dev_get_drvdata(&chip->dev);
@@ -264,6 +265,21 @@ static const struct tpm_class_ops tpm_crb = {
        .req_complete_val = CRB_DRV_STS_COMPLETE,
 };
 
+static int crb_init(struct acpi_device *device, struct crb_priv *priv)
+{
+       struct tpm_chip *chip;
+
+       chip = tpmm_chip_alloc(&device->dev, &tpm_crb);
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+
+       dev_set_drvdata(&chip->dev, priv);
+       chip->acpi_dev_handle = device->handle;
+       chip->flags = TPM_CHIP_FLAG_TPM2;
+
+       return tpm_chip_register(chip);
+}
+
 static int crb_check_resource(struct acpi_resource *ares, void *data)
 {
        struct resource *io_res = data;
@@ -385,7 +401,6 @@ static int crb_acpi_add(struct acpi_device *device)
 {
        struct acpi_table_tpm2 *buf;
        struct crb_priv *priv;
-       struct tpm_chip *chip;
        struct device *dev = &device->dev;
        acpi_status status;
        u32 sm;
@@ -423,28 +438,13 @@ static int crb_acpi_add(struct acpi_device *device)
        if (rc)
                return rc;
 
-       chip = tpmm_chip_alloc(dev, &tpm_crb);
-       if (IS_ERR(chip))
-               return PTR_ERR(chip);
-
-       dev_set_drvdata(&chip->dev, priv);
-       chip->acpi_dev_handle = device->handle;
-       chip->flags = TPM_CHIP_FLAG_TPM2;
-
        rc  = crb_cmd_ready(dev, priv);
        if (rc)
                return rc;
 
-       pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
-
-       rc = tpm_chip_register(chip);
-       if (rc) {
+       rc = crb_init(device, priv);
+       if (rc)
                crb_go_idle(dev, priv);
-               pm_runtime_disable(dev);
-       }
-
-       pm_runtime_put(dev);
 
        return rc;
 }
@@ -456,34 +456,9 @@ static int crb_acpi_remove(struct acpi_device *device)
 
        tpm_chip_unregister(chip);
 
-       pm_runtime_disable(dev);
-
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int crb_pm_runtime_suspend(struct device *dev)
-{
-       struct tpm_chip *chip = dev_get_drvdata(dev);
-       struct crb_priv *priv = dev_get_drvdata(&chip->dev);
-
-       return crb_go_idle(dev, priv);
-}
-
-static int crb_pm_runtime_resume(struct device *dev)
-{
-       struct tpm_chip *chip = dev_get_drvdata(dev);
-       struct crb_priv *priv = dev_get_drvdata(&chip->dev);
-
-       return crb_cmd_ready(dev, priv);
-}
-#endif /* CONFIG_PM */
-
-static const struct dev_pm_ops crb_pm = {
-       SET_SYSTEM_SLEEP_PM_OPS(tpm_pm_suspend, tpm_pm_resume)
-       SET_RUNTIME_PM_OPS(crb_pm_runtime_suspend, crb_pm_runtime_resume, NULL)
-};
-
 static struct acpi_device_id crb_device_ids[] = {
        {"MSFT0101", 0},
        {"", 0},