diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-09-27 11:01:13 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2016-09-27 11:01:25 +0200 |
| commit | 2b7926ae1cd44efb006e16d5d165700e5f673294 (patch) | |
| tree | d261b31fe28538167663a21f00372feb97aa8016 /drivers/char | |
| parent | Revert "tmp/tpm_crb: implement runtime pm for tpm_crb" (diff) | |
| download | linux-2b7926ae1cd44efb006e16d5d165700e5f673294.tar.xz linux-2b7926ae1cd44efb006e16d5d165700e5f673294.zip | |
Revert "tpm/tpm_crb: open code the crb_init into acpi_add"
This reverts commit 0c22db435bf79d3cf3089df7ff198d4867df3c27.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/tpm/tpm_crb.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index d385e63008a6..2d1669c0f6c0 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -265,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; @@ -386,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; @@ -424,19 +438,11 @@ 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; - rc = tpm_chip_register(chip); + rc = crb_init(device, priv); if (rc) crb_go_idle(dev, priv); |