From: Jarkko Sakkinen <jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
To: Peter Huewe <peterhuewe-Mmb7MZpHnFY@public.gmane.org>
Cc: open list <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
"moderated list:TPM DEVICE DRIVER"
<tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org>,
Christophe Ricard
<christophe-h.ricard-qxv4g6HH51o@public.gmane.org>
Subject: [PATCH] tpm: cleanup tpm_tis_remove()
Date: Thu, 31 Mar 2016 13:11:27 +0300 [thread overview]
Message-ID: <1459419087-20487-1-git-send-email-jarkko.sakkinen@linux.intel.com> (raw)
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.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
---
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
------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140
next reply other threads:[~2016-03-31 10:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-31 10:11 Jarkko Sakkinen [this message]
2016-03-31 10:15 ` [PATCH] tpm: cleanup tpm_tis_remove() Jarkko Sakkinen
[not found] ` <20160331101536.GA20686-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-03-31 10:17 ` Jarkko Sakkinen
[not found] ` <20160331101713.GB20686-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-03-31 10:29 ` Jarkko Sakkinen
[not found] ` <20160331102958.GA22364-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2016-03-31 10:33 ` Christophe Henri RICARD
2016-03-31 14:55 ` Christophe Henri RICARD
[not found] ` <8646C2A85C5D44419E1B33F16B0BD501024AFA6B6E-+EwDPpWUVoThJTuQ9jeba9BPR1lH4CV8@public.gmane.org>
2016-03-31 16:19 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459419087-20487-1-git-send-email-jarkko.sakkinen@linux.intel.com \
--to=jarkko.sakkinen-vuqaysv1563yd54fqh9/ca@public.gmane.org \
--cc=christophe-h.ricard-qxv4g6HH51o@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=peterhuewe-Mmb7MZpHnFY@public.gmane.org \
--cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).