Re: [PATCH 16/19] powerpc/powermac: Add missing include of header pmac.h
From: Mathieu Malaterre
Date: Fri Jun 22 2018 - 05:50:05 EST
This one is also ok.
On Thu, Mar 22, 2018 at 9:21 PM Mathieu Malaterre <malat@xxxxxxxxxx> wrote:
>
> The header `pmac.h` was not included, leading to the following warnings,
> treated as error with W=1:
>
> arch/powerpc/platforms/powermac/time.c:69:13: error: no previous prototype for âpmac_time_initâ [-Werror=missing-prototypes]
> arch/powerpc/platforms/powermac/time.c:207:15: error: no previous prototype for âpmac_get_boot_timeâ [-Werror=missing-prototypes]
> arch/powerpc/platforms/powermac/time.c:222:6: error: no previous prototype for âpmac_get_rtc_timeâ [-Werror=missing-prototypes]
> arch/powerpc/platforms/powermac/time.c:240:5: error: no previous prototype for âpmac_set_rtc_timeâ [-Werror=missing-prototypes]
> arch/powerpc/platforms/powermac/time.c:259:12: error: no previous prototype for âvia_calibrate_decrâ [-Werror=missing-prototypes]
> arch/powerpc/platforms/powermac/time.c:311:13: error: no previous prototype for âpmac_calibrate_decrâ [-Werror=missing-prototypes]
>
> The function `via_calibrate_decr` was made static to silence a warning.
>
> Signed-off-by: Mathieu Malaterre <malat@xxxxxxxxxx>
> ---
> arch/powerpc/platforms/powermac/time.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
> index 274af6fa388e..5cc6fa40fcc4 100644
> --- a/arch/powerpc/platforms/powermac/time.c
> +++ b/arch/powerpc/platforms/powermac/time.c
> @@ -34,6 +34,8 @@
> #include <asm/nvram.h>
> #include <asm/smu.h>
>
> +#include "pmac.h"
> +
> #undef DEBUG
>
> #ifdef DEBUG
> @@ -256,7 +258,7 @@ int pmac_set_rtc_time(struct rtc_time *tm)
> * Calibrate the decrementer register using VIA timer 1.
> * This is used both on powermacs and CHRP machines.
> */
> -int __init via_calibrate_decr(void)
> +static int __init via_calibrate_decr(void)
> {
> struct device_node *vias;
> volatile unsigned char __iomem *via;
> --
> 2.11.0
>