tpm: cleanup tpm_tis_remove()

Created a local variable pointing to the INT_ENABLE_x register. The
expression clearing INT_ENABLE_x.globalIntEnable is unreadable and
hard to modify without surpassing the 80 char boundary.

Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Christophe Ricard <christophe-h.ricard@st.com>

diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index eed3bf510682550076b8bd301286e49776dfb83c..18236f66c084d528dcffc81f8b0d3066efb6235d 100644 (file)
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -650,15 +650,13 @@ 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);
 }