From ee1779840d093ebf6893c97115422fb5171b54d7 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Wed, 23 Mar 2016 08:16:09 +0200 Subject: tpm: drop 'base' from struct tpm_vendor_specific Dropped the field 'base' from struct tpm_vendor_specific and migrated it to the private structures of tpm_atmel and tpm_nsc. Signed-off-by: Jarkko Sakkinen Reviewed-by: Jason Gunthorpe --- drivers/char/tpm/tpm_atmel.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'drivers/char/tpm/tpm_atmel.h') diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h index 3fd929de9739..bced6780afe8 100644 --- a/drivers/char/tpm/tpm_atmel.h +++ b/drivers/char/tpm/tpm_atmel.h @@ -25,8 +25,14 @@ struct tpm_atmel_priv { int region_size; int have_region; + unsigned long base; }; +static inline struct tpm_atmel_priv *atmel_get_priv(struct tpm_chip *chip) +{ + return chip->vendor.priv; +} + #ifdef CONFIG_PPC64 #include @@ -83,8 +89,9 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size) return ioremap(*base, *region_size); } #else -#define atmel_getb(chip, offset) inb(chip->vendor->base + offset) -#define atmel_putb(val, chip, offset) outb(val, chip->vendor->base + offset) +#define atmel_getb(chip, offset) inb(atmel_get_priv(chip)->base + offset) +#define atmel_putb(val, chip, offset) \ + outb(val, atmel_get_priv(chip)->base + offset) #define atmel_request_region request_region #define atmel_release_region release_region /* Atmel definitions */ -- cgit v1.2.3