Created a local variable for the register in order to clean up
experession where TPM_GLOBAL_INT_ENABLE is cleared. This expression is
horrible to read and makes changing the function uncomfortable because
like easily surpass 80 characters.

Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com>
---
 drivers/char/tpm/tpm_tis.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 068f021..ce2b984 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -658,15 +658,14 @@ MODULE_PARM_DESC(interrupts, "Enable interrupts");
 
 static void tpm_tis_remove(struct tpm_chip *chip)
 {
+       void __iomem *reg = chip->vendor.iobase +
+               TPM_INT_ENABLE(chip->vendor.locality);
+
        if (chip->flags & TPM_CHIP_FLAG_TPM2)
                tpm2_shutdown(chip, TPM2_SU_CLEAR);
 
-       iowrite32(~TPM_GLOBAL_INT_ENABLE &
-                 ioread32(chip->vendor.iobase +
-                          TPM_INT_ENABLE(chip->vendor.
-                                         locality)),
-                 chip->vendor.iobase +
-                 TPM_INT_ENABLE(chip->vendor.locality));
+       iowrite32(~TPM_GLOBAL_INT_ENABLE & ioread32(reg), reg);
+
        release_locality(chip, chip->vendor.locality, 1);
 }
 
-- 
2.7.4

Reply via email to