[tpmdd-devel] tpm: cleanup tpm_tis_remove()
diff mbox

Message ID 1459419087-20487-1-git-send-email-jarkko.sakkinen@linux.intel.com
State New
Headers show

Commit Message

Jarkko Sakkinen March 31, 2016, 10:11 a.m. UTC
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@linux.intel.com>
---
 drivers/char/tpm/tpm_tis.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

Jarkko Sakkinen March 31, 2016, 10:15 a.m. UTC | #1
Christophe,

On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> 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.

Can you test this patch your hardware and reply with Tested-by tag if it
does? I can then update your iobase patch to apply on top of this.

I thought it was better idea to simplify the expression a little bit
than make it even worse mess.

/Jarkko

> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@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
> 

------------------------------------------------------------------------------
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
Jarkko Sakkinen March 31, 2016, 10:17 a.m. UTC | #2
On Thu, Mar 31, 2016 at 01:15:36PM +0300, Jarkko Sakkinen wrote:
> Christophe,
> 
> On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> > 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.
> 
> Can you test this patch your hardware and reply with Tested-by tag if it
> does? I can then update your iobase patch to apply on top of this.
> 
> I thought it was better idea to simplify the expression a little bit
> than make it even worse mess.

And yes  I'll fix all the typos in the commit msg in this patch before
applying it :)

/Jarkko

------------------------------------------------------------------------------
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
Jarkko Sakkinen March 31, 2016, 10:29 a.m. UTC | #3
On Thu, Mar 31, 2016 at 01:17:13PM +0300, Jarkko Sakkinen wrote:
> On Thu, Mar 31, 2016 at 01:15:36PM +0300, Jarkko Sakkinen wrote:
> > Christophe,
> > 
> > On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> > > 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.
> > 
> > Can you test this patch your hardware and reply with Tested-by tag if it
> > does? I can then update your iobase patch to apply on top of this.
> > 
> > I thought it was better idea to simplify the expression a little bit
> > than make it even worse mess.
> 
> And yes  I'll fix all the typos in the commit msg in this patch before
> applying it :)

I committed this to my master branch with the option to drop if there it
does not get reviewed/tested-by's (which I doubt). Since this touches
multiple patches (locality patch too) and in addition there was couple
glitches maybe it would be good if you would prepare one more round of
the series if you don't mind?

/Jarkko

------------------------------------------------------------------------------
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
Christophe Henri RICARD March 31, 2016, 10:33 a.m. UTC | #4
This patch will get tested in the afternoon.

I don't mind doing a new round will be done tonight if everything go smoothly.

Best Regards
Christophe

-----Original Message-----
From: Jarkko Sakkinen [mailto:jarkko.sakkinen@linux.intel.com] 
Sent: jeudi 31 mars 2016 12:30
To: Christophe Henri RICARD
Cc: Marcel Selhorst; Jason Gunthorpe; moderated list:TPM DEVICE DRIVER; open list; Peter Huewe
Subject: Re: [PATCH] tpm: cleanup tpm_tis_remove()

On Thu, Mar 31, 2016 at 01:17:13PM +0300, Jarkko Sakkinen wrote:
> On Thu, Mar 31, 2016 at 01:15:36PM +0300, Jarkko Sakkinen wrote:
> > Christophe,
> > 
> > On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> > > 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.
> > 
> > Can you test this patch your hardware and reply with Tested-by tag 
> > if it does? I can then update your iobase patch to apply on top of this.
> > 
> > I thought it was better idea to simplify the expression a little bit 
> > than make it even worse mess.
> 
> And yes  I'll fix all the typos in the commit msg in this patch before 
> applying it :)

I committed this to my master branch with the option to drop if there it does not get reviewed/tested-by's (which I doubt). Since this touches multiple patches (locality patch too) and in addition there was couple glitches maybe it would be good if you would prepare one more round of the series if you don't mind?

/Jarkko

------------------------------------------------------------------------------
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
Christophe Henri RICARD March 31, 2016, 2:55 p.m. UTC | #5
Tested-by: Christophe Ricard <christophe-h.ricard@st.com>

-----Original Message-----
From: Jarkko Sakkinen [mailto:jarkko.sakkinen@linux.intel.com] 
Sent: jeudi 31 mars 2016 12:30
To: Christophe Henri RICARD
Cc: Marcel Selhorst; Jason Gunthorpe; moderated list:TPM DEVICE DRIVER; open list; Peter Huewe
Subject: Re: [PATCH] tpm: cleanup tpm_tis_remove()

On Thu, Mar 31, 2016 at 01:17:13PM +0300, Jarkko Sakkinen wrote:
> On Thu, Mar 31, 2016 at 01:15:36PM +0300, Jarkko Sakkinen wrote:
> > Christophe,
> > 
> > On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> > > 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.
> > 
> > Can you test this patch your hardware and reply with Tested-by tag 
> > if it does? I can then update your iobase patch to apply on top of this.
> > 
> > I thought it was better idea to simplify the expression a little bit 
> > than make it even worse mess.
> 
> And yes  I'll fix all the typos in the commit msg in this patch before 
> applying it :)

I committed this to my master branch with the option to drop if there it does not get reviewed/tested-by's (which I doubt). Since this touches multiple patches (locality patch too) and in addition there was couple glitches maybe it would be good if you would prepare one more round of the series if you don't mind?

/Jarkko

------------------------------------------------------------------------------
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
Jarkko Sakkinen March 31, 2016, 4:19 p.m. UTC | #6
On Thu, Mar 31, 2016 at 04:55:50PM +0200, Christophe Henri RICARD wrote:
> Tested-by: Christophe Ricard <christophe-h.ricard@st.com>

Thanks. This is quite on brainer cleanup and since it is peer tested you
should be able safely rebase your patch set on top of it. It's applied
to my master branch.

/Jarkko

> -----Original Message-----
> From: Jarkko Sakkinen [mailto:jarkko.sakkinen@linux.intel.com] 
> Sent: jeudi 31 mars 2016 12:30
> To: Christophe Henri RICARD
> Cc: Marcel Selhorst; Jason Gunthorpe; moderated list:TPM DEVICE DRIVER; open list; Peter Huewe
> Subject: Re: [PATCH] tpm: cleanup tpm_tis_remove()
> 
> On Thu, Mar 31, 2016 at 01:17:13PM +0300, Jarkko Sakkinen wrote:
> > On Thu, Mar 31, 2016 at 01:15:36PM +0300, Jarkko Sakkinen wrote:
> > > Christophe,
> > > 
> > > On Thu, Mar 31, 2016 at 01:11:27PM +0300, Jarkko Sakkinen wrote:
> > > > 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.
> > > 
> > > Can you test this patch your hardware and reply with Tested-by tag 
> > > if it does? I can then update your iobase patch to apply on top of this.
> > > 
> > > I thought it was better idea to simplify the expression a little bit 
> > > than make it even worse mess.
> > 
> > And yes  I'll fix all the typos in the commit msg in this patch before 
> > applying it :)
> 
> I committed this to my master branch with the option to drop if there it does not get reviewed/tested-by's (which I doubt). Since this touches multiple patches (locality patch too) and in addition there was couple glitches maybe it would be good if you would prepare one more round of the series if you don't mind?
> 
> /Jarkko

------------------------------------------------------------------------------
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

Patch
diff mbox

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);
 }