[19/19] powerpc/tau: Synchronize function prototypes and body

Message ID 20180322202007.23088-20-malat@debian.org
State New
Headers show
Series
  • powerpc/ppc32: make W=1 compilation errors free
Related show

Commit Message

Mathieu Malaterre March 22, 2018, 8:20 p.m.
Some function prototypes and body for Thermal Assist Units were not in
sync. Update the function definition to match the existing function
declaration found in `setup-common.c`, changing an `int` return type to a
`u32` return type. Move the prototypes to a header file. Fix the following
warnings, treated as error with W=1:

  arch/powerpc/kernel/tau_6xx.c:257:5: error: no previous prototype for ‘cpu_temp_both’ [-Werror=missing-prototypes]
  arch/powerpc/kernel/tau_6xx.c:262:5: error: no previous prototype for ‘cpu_temp’ [-Werror=missing-prototypes]
  arch/powerpc/kernel/tau_6xx.c:267:5: error: no previous prototype for ‘tau_interrupts’ [-Werror=missing-prototypes]

Compile tested with CONFIG_TAU_INT.

Signed-off-by: Mathieu Malaterre <malat@debian.org>
---
 arch/powerpc/kernel/irq.c          | 2 +-
 arch/powerpc/kernel/setup-common.c | 6 ------
 arch/powerpc/kernel/setup.h        | 6 ++++++
 arch/powerpc/kernel/tau_6xx.c      | 7 +++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

Comments

christophe leroy March 23, 2018, 12:22 p.m. | #1
Le 22/03/2018 à 21:20, Mathieu Malaterre a écrit :
> Some function prototypes and body for Thermal Assist Units were not in
> sync. Update the function definition to match the existing function
> declaration found in `setup-common.c`, changing an `int` return type to a
> `u32` return type. Move the prototypes to a header file. Fix the following
> warnings, treated as error with W=1:
> 
>    arch/powerpc/kernel/tau_6xx.c:257:5: error: no previous prototype for ‘cpu_temp_both’ [-Werror=missing-prototypes]
>    arch/powerpc/kernel/tau_6xx.c:262:5: error: no previous prototype for ‘cpu_temp’ [-Werror=missing-prototypes]
>    arch/powerpc/kernel/tau_6xx.c:267:5: error: no previous prototype for ‘tau_interrupts’ [-Werror=missing-prototypes]
> 
> Compile tested with CONFIG_TAU_INT.
> 
> Signed-off-by: Mathieu Malaterre <malat@debian.org>
> ---
>   arch/powerpc/kernel/irq.c          | 2 +-
>   arch/powerpc/kernel/setup-common.c | 6 ------
>   arch/powerpc/kernel/setup.h        | 6 ++++++
>   arch/powerpc/kernel/tau_6xx.c      | 7 +++++--
>   4 files changed, 12 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
> index f88038847790..3777b6e09142 100644
> --- a/arch/powerpc/kernel/irq.c
> +++ b/arch/powerpc/kernel/irq.c
> @@ -89,7 +89,7 @@ atomic_t ppc_n_lost_interrupts;
>   
>   #ifdef CONFIG_TAU_INT
>   extern int tau_initialized;
> -extern int tau_interrupts(int);
> +extern u32 tau_interrupts(unsigned long cpu);
>   #endif
>   #endif /* CONFIG_PPC32 */
>   
> diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
> index d73ec518ef80..bd3675c3984b 100644
> --- a/arch/powerpc/kernel/setup-common.c
> +++ b/arch/powerpc/kernel/setup-common.c
> @@ -192,12 +192,6 @@ void machine_halt(void)
>   	machine_hang();
>   }
>   
> -
> -#ifdef CONFIG_TAU
> -extern u32 cpu_temp(unsigned long cpu);
> -extern u32 cpu_temp_both(unsigned long cpu);
> -#endif /* CONFIG_TAU */
> -
>   #ifdef CONFIG_SMP
>   DEFINE_PER_CPU(unsigned int, cpu_pvr);
>   #endif
> diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h
> index d768023a04bd..3c9c19430439 100644
> --- a/arch/powerpc/kernel/setup.h
> +++ b/arch/powerpc/kernel/setup.h
> @@ -70,4 +70,10 @@ void kvm_cma_reserve(void);
>   static inline void kvm_cma_reserve(void) { };
>   #endif
>   
> +#ifdef CONFIG_TAU
> +extern u32 cpu_temp(unsigned long cpu);
> +extern u32 cpu_temp_both(unsigned long cpu);
> +extern u32 tau_interrupts(unsigned long cpu);

extern keyword is not needed


Christophe

> +#endif /* CONFIG_TAU */
> +
>   #endif /* __ARCH_POWERPC_KERNEL_SETUP_H */
> diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
> index 1fc6a89a978e..e2ab8a111b69 100644
> --- a/arch/powerpc/kernel/tau_6xx.c
> +++ b/arch/powerpc/kernel/tau_6xx.c
> @@ -27,6 +27,9 @@
>   #include <asm/cache.h>
>   #include <asm/8xx_immap.h>
>   #include <asm/machdep.h>
> +#include <asm/asm-prototypes.h>
> +
> +#include "setup.h"
>   
>   static struct tau_temp
>   {
> @@ -259,12 +262,12 @@ u32 cpu_temp_both(unsigned long cpu)
>   	return ((tau[cpu].high << 16) | tau[cpu].low);
>   }
>   
> -int cpu_temp(unsigned long cpu)
> +u32 cpu_temp(unsigned long cpu)
>   {
>   	return ((tau[cpu].high + tau[cpu].low) / 2);
>   }
>   
> -int tau_interrupts(unsigned long cpu)
> +u32 tau_interrupts(unsigned long cpu)
>   {
>   	return (tau[cpu].interrupts);
>   }
> 

---
L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
https://www.avast.com/antivirus

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index f88038847790..3777b6e09142 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -89,7 +89,7 @@  atomic_t ppc_n_lost_interrupts;
 
 #ifdef CONFIG_TAU_INT
 extern int tau_initialized;
-extern int tau_interrupts(int);
+extern u32 tau_interrupts(unsigned long cpu);
 #endif
 #endif /* CONFIG_PPC32 */
 
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index d73ec518ef80..bd3675c3984b 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -192,12 +192,6 @@  void machine_halt(void)
 	machine_hang();
 }
 
-
-#ifdef CONFIG_TAU
-extern u32 cpu_temp(unsigned long cpu);
-extern u32 cpu_temp_both(unsigned long cpu);
-#endif /* CONFIG_TAU */
-
 #ifdef CONFIG_SMP
 DEFINE_PER_CPU(unsigned int, cpu_pvr);
 #endif
diff --git a/arch/powerpc/kernel/setup.h b/arch/powerpc/kernel/setup.h
index d768023a04bd..3c9c19430439 100644
--- a/arch/powerpc/kernel/setup.h
+++ b/arch/powerpc/kernel/setup.h
@@ -70,4 +70,10 @@  void kvm_cma_reserve(void);
 static inline void kvm_cma_reserve(void) { };
 #endif
 
+#ifdef CONFIG_TAU
+extern u32 cpu_temp(unsigned long cpu);
+extern u32 cpu_temp_both(unsigned long cpu);
+extern u32 tau_interrupts(unsigned long cpu);
+#endif /* CONFIG_TAU */
+
 #endif /* __ARCH_POWERPC_KERNEL_SETUP_H */
diff --git a/arch/powerpc/kernel/tau_6xx.c b/arch/powerpc/kernel/tau_6xx.c
index 1fc6a89a978e..e2ab8a111b69 100644
--- a/arch/powerpc/kernel/tau_6xx.c
+++ b/arch/powerpc/kernel/tau_6xx.c
@@ -27,6 +27,9 @@ 
 #include <asm/cache.h>
 #include <asm/8xx_immap.h>
 #include <asm/machdep.h>
+#include <asm/asm-prototypes.h>
+
+#include "setup.h"
 
 static struct tau_temp
 {
@@ -259,12 +262,12 @@  u32 cpu_temp_both(unsigned long cpu)
 	return ((tau[cpu].high << 16) | tau[cpu].low);
 }
 
-int cpu_temp(unsigned long cpu)
+u32 cpu_temp(unsigned long cpu)
 {
 	return ((tau[cpu].high + tau[cpu].low) / 2);
 }
 
-int tau_interrupts(unsigned long cpu)
+u32 tau_interrupts(unsigned long cpu)
 {
 	return (tau[cpu].interrupts);
 }