Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d30b8e4f authored by Jarkko Sakkinen's avatar Jarkko Sakkinen
Browse files

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: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarChristophe Ricard <christophe-h.ricard@st.com>
parent 796d8030

drivers/char/tpm/tpm_tis.c

+4 −6
Original line number Diff line number Diff line
@@ -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);

}