[v1] char: tpm: Prepare cleanup of powerpc's asm/prom.h

[PATCH] char: tpm: Prepare cleanup of powerpc's asm/prom.h

Posted by Christophe Leroy 4 years, 2 months ago

powerpc's asm/prom.h brings some headers that it doesn't
need itself.

In order to clean it up, first add missing headers in
users of asm/prom.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 drivers/char/tpm/tpm_atmel.h   | 2 --
 drivers/char/tpm/tpm_ibmvtpm.c | 1 -
 2 files changed, 3 deletions(-)

diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index ba37e77e8af3..959f7cce8301 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -26,8 +26,6 @@ struct tpm_atmel_priv {
 
 #ifdef CONFIG_PPC64
 
-#include <asm/prom.h>
-
 #define atmel_getb(priv, offset) readb(priv->iobase + offset)
 #define atmel_putb(val, priv, offset) writeb(val, priv->iobase + offset)
 #define atmel_request_region request_mem_region
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index 3af4c07a9342..1180cce7067a 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -20,7 +20,6 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/wait.h>
-#include <asm/prom.h>
 
 #include "tpm.h"
 #include "tpm_ibmvtpm.h"
-- 
2.35.1

Re: [PATCH] char: tpm: Prepare cleanup of powerpc's asm/prom.h

Posted by Jarkko Sakkinen 4 years, 2 months ago

On Sat, Apr 02, 2022 at 12:29:19PM +0200, Christophe Leroy wrote:
> powerpc's asm/prom.h brings some headers that it doesn't
> need itself.
> 
> In order to clean it up, first add missing headers in
> users of asm/prom.h
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

I don't understand this. It changes nothing as far as kernel is concerned.

> ---
>  drivers/char/tpm/tpm_atmel.h   | 2 --
>  drivers/char/tpm/tpm_ibmvtpm.c | 1 -
>  2 files changed, 3 deletions(-)
> 
> diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
> index ba37e77e8af3..959f7cce8301 100644
> --- a/drivers/char/tpm/tpm_atmel.h
> +++ b/drivers/char/tpm/tpm_atmel.h
> @@ -26,8 +26,6 @@ struct tpm_atmel_priv {
>  
>  #ifdef CONFIG_PPC64
>  
> -#include <asm/prom.h>
> -
>  #define atmel_getb(priv, offset) readb(priv->iobase + offset)
>  #define atmel_putb(val, priv, offset) writeb(val, priv->iobase + offset)
>  #define atmel_request_region request_mem_region
> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
> index 3af4c07a9342..1180cce7067a 100644
> --- a/drivers/char/tpm/tpm_ibmvtpm.c
> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
> @@ -20,7 +20,6 @@
>  #include <linux/spinlock.h>
>  #include <linux/interrupt.h>
>  #include <linux/wait.h>
> -#include <asm/prom.h>
>  
>  #include "tpm.h"
>  #include "tpm_ibmvtpm.h"
> -- 
> 2.35.1
> 

BR, Jarkko

Re: [PATCH] char: tpm: Prepare cleanup of powerpc's asm/prom.h

Posted by Christophe Leroy 4 years, 2 months ago


Le 03/04/2022 à 12:23, Jarkko Sakkinen a écrit :
> On Sat, Apr 02, 2022 at 12:29:19PM +0200, Christophe Leroy wrote:
>> powerpc's asm/prom.h brings some headers that it doesn't
>> need itself.
>>
>> In order to clean it up, first add missing headers in
>> users of asm/prom.h
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> 
> I don't understand this. It changes nothing as far as kernel is concerned.


I sent v2 with a more detailed description.

Thanks
Christophe


> 
>> ---
>>   drivers/char/tpm/tpm_atmel.h   | 2 --
>>   drivers/char/tpm/tpm_ibmvtpm.c | 1 -
>>   2 files changed, 3 deletions(-)
>>
>> diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
>> index ba37e77e8af3..959f7cce8301 100644
>> --- a/drivers/char/tpm/tpm_atmel.h
>> +++ b/drivers/char/tpm/tpm_atmel.h
>> @@ -26,8 +26,6 @@ struct tpm_atmel_priv {
>>   
>>   #ifdef CONFIG_PPC64
>>   
>> -#include <asm/prom.h>
>> -
>>   #define atmel_getb(priv, offset) readb(priv->iobase + offset)
>>   #define atmel_putb(val, priv, offset) writeb(val, priv->iobase + offset)
>>   #define atmel_request_region request_mem_region
>> diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
>> index 3af4c07a9342..1180cce7067a 100644
>> --- a/drivers/char/tpm/tpm_ibmvtpm.c
>> +++ b/drivers/char/tpm/tpm_ibmvtpm.c
>> @@ -20,7 +20,6 @@
>>   #include <linux/spinlock.h>
>>   #include <linux/interrupt.h>
>>   #include <linux/wait.h>
>> -#include <asm/prom.h>
>>   
>>   #include "tpm.h"
>>   #include "tpm_ibmvtpm.h"
>> -- 
>> 2.35.1
>>
> 
> BR, Jarkko