xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tpm: drop tpm_atmel specific fields from tpm_vendor_specific

Browse Source 
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>
This commit is contained in:
Jarkko Sakkinen
2016-03-23 07:10:22 +02:00
parent ec5fd99d36
commit 23d06ff700
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/char/tpm/tpm.h
View File

@@ -136,9 +136,6 @@ struct tpm_vendor_specific {
int irq; int irq;
int region_size;
int have_region;
struct list_head list; struct list_head list;
int locality; int locality;
unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */ unsigned long timeout_a, timeout_b, timeout_c, timeout_d; /* jiffies */

18
drivers/char/tpm/tpm_atmel.c
View File

@@ -136,12 +136,13 @@ static struct platform_device *pdev;
static void atml_plat_remove(void) static void atml_plat_remove(void)
{ {
struct tpm_chip *chip = dev_get_drvdata(&pdev->dev); struct tpm_chip *chip = dev_get_drvdata(&pdev->dev);
struct tpm_atmel_priv *priv = chip->vendor.priv;
if (chip) { if (chip) {
tpm_chip_unregister(chip); tpm_chip_unregister(chip);
if (chip->vendor.have_region) if (priv->have_region)
atmel_release_region(chip->vendor.base, atmel_release_region(chip->vendor.base,
chip->vendor.region_size); priv->region_size);
atmel_put_base_addr(chip->vendor.iobase); atmel_put_base_addr(chip->vendor.iobase);
platform_device_unregister(pdev); platform_device_unregister(pdev);
} }
@@ -163,6 +164,7 @@ static int __init init_atmel(void)
int have_region, region_size; int have_region, region_size;
unsigned long base; unsigned long base;
struct tpm_chip *chip; struct tpm_chip *chip;
struct tpm_atmel_priv *priv;
rc = platform_driver_register(&atml_drv); rc = platform_driver_register(&atml_drv);
if (rc) if (rc)
@@ -183,6 +185,15 @@ static int __init init_atmel(void)
goto err_rel_reg; goto err_rel_reg;
} }
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); chip = tpmm_chip_alloc(&pdev->dev, &tpm_atmel);
if (IS_ERR(chip)) { if (IS_ERR(chip)) {
rc = PTR_ERR(chip); rc = PTR_ERR(chip);
@@ -191,8 +202,7 @@ static int __init init_atmel(void)
chip->vendor.iobase = iobase; chip->vendor.iobase = iobase;
chip->vendor.base = base; chip->vendor.base = base;
chip->vendor.have_region = have_region; chip->vendor.priv = priv;
chip->vendor.region_size = region_size;
rc = tpm_chip_register(chip); rc = tpm_chip_register(chip);
if (rc) if (rc)

5
drivers/char/tpm/tpm_atmel.h
View File

@@ -22,6 +22,11 @@
* *
*/ */
struct tpm_atmel_priv {
int region_size;
int have_region;
};
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
#include <asm/prom.h> #include <asm/prom.h>