Introduced a private struct tpm_atmel_priv that contains the variables
have_region and region_size that were previously located in struct
tpm_vendor_specific. These fields were only used by tpm_atmel.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
- int region_size;
- int have_region;
-
struct list_head list;
int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
struct list_head list;
int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */
static void atml_plat_remove(void)
{
struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
static void atml_plat_remove(void)
{
struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
+ struct tpm_atmel_priv *priv = chip->vendor.priv;
if (chip) {
tpm_chip_unregister(chip);
if (chip) {
tpm_chip_unregister(chip);
- if (chip->vendor.have_region)
atmel_release_region(chip->vendor.base,
atmel_release_region(chip->vendor.base,
- chip->vendor.region_size);
atmel_put_base_addr(chip->vendor.iobase);
platform_device_unregister(pdev);
}
atmel_put_base_addr(chip->vendor.iobase);
platform_device_unregister(pdev);
}
int have_region, region_size;
unsigned long base;
struct tpm_chip *chip;
int have_region, region_size;
unsigned long base;
struct tpm_chip *chip;
+ struct tpm_atmel_priv *priv;
rc = platform_driver_register(&atml_drv);
if (rc)
rc = platform_driver_register(&atml_drv);
if (rc)
+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv) {
+ rc = -ENOMEM;
+ goto err_unreg_dev;
+ }
+
+ priv->have_region = have_region;
+ priv->region_size = region_size;
+
chip = tpmm_chip_alloc(&pdev->dev, &tpm_atmel);
if (IS_ERR(chip)) {
rc = PTR_ERR(chip);
chip = tpmm_chip_alloc(&pdev->dev, &tpm_atmel);
if (IS_ERR(chip)) {
rc = PTR_ERR(chip);
chip->vendor.iobase = iobase;
chip->vendor.base = base;
chip->vendor.iobase = iobase;
chip->vendor.base = base;
- chip->vendor.have_region = have_region;
- chip->vendor.region_size = region_size;
+ chip->vendor.priv = priv;
rc = tpm_chip_register(chip);
if (rc)
rc = tpm_chip_register(chip);
if (rc)
+struct tpm_atmel_priv {
+ int region_size;
+ int have_region;
+};
+
#ifdef CONFIG_PPC64
#include <asm/prom.h>
#ifdef CONFIG_PPC64
#include <asm/prom.h>