tpm: two-phase chip management functions

[firefly-linux-kernel-4.4.55.git] / drivers / char / tpm / tpm_atmel.c

diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index 435c8b9dd2f8fe64e6992fbf1ba5c5e8f7e462f6..3d4c6c3b0433eecb1ad9401e1fc9a2eee2e56a37 100644 (file)
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -138,11 +138,11 @@ static void atml_plat_remove(void)
        struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
 
        if (chip) {
+               tpm_chip_unregister(chip);
                if (chip->vendor.have_region)
                        atmel_release_region(chip->vendor.base,
                                             chip->vendor.region_size);
                atmel_put_base_addr(chip->vendor.iobase);
-               tpm_remove_hardware(chip->dev);
                platform_device_unregister(pdev);
        }
 }
@@ -183,8 +183,9 @@ static int __init init_atmel(void)
                goto err_rel_reg;
        }
 
-       if (!(chip = tpm_register_hardware(&pdev->dev, &tpm_atmel))) {
-               rc = -ENODEV;
+       chip = tpmm_chip_alloc(&pdev->dev, &tpm_atmel);
+       if (IS_ERR(chip)) {
+               rc = PTR_ERR(chip);
                goto err_unreg_dev;
        }
 
@@ -193,6 +194,10 @@ static int __init init_atmel(void)
        chip->vendor.have_region = have_region;
        chip->vendor.region_size = region_size;
 
+       rc = tpm_chip_register(chip);
+       if (rc)
+               goto err_unreg_dev;
+
        return 0;
 
 err_unreg_dev: