| Message ID | a3188c216e3cc59b12c5ea3682e233733911475d.1650012003.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] char: tpm: Prepare cleanup of powerpc's asm/prom.h | expand |
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"
powerpc's asm/prom.h brings some headers that it doesn't need itself. In order to clean it up in a further step, first clean all files that include asm/prom.h Some files don't need asm/prom.h at all. For those ones, just remove inclusion of asm/prom.h Some files don't need any of the items provided by asm/prom.h, but need some of the headers included by asm/prom.h. For those ones, add the needed headers that are brought by asm/prom.h at the moment, then remove asm/prom.h Some files really need asm/prom.h but also need some of the headers included by asm/prom.h. For those one, leave asm/prom.h but also add the needed headers so that they can be removed from asm/prom.h in a later step. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- v2: More detailed commit description --- drivers/char/tpm/tpm_atmel.h | 2 -- drivers/char/tpm/tpm_ibmvtpm.c | 1 - 2 files changed, 3 deletions(-)