Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b12634e3 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Jason Cooper
Browse files

ARM: mvebu: fix some sparse warnings 



This patch fixes conflicting types for 'set_cpu_coherent' and fixes the
following sparse warnings.

arch/arm/mach-mvebu/system-controller.c:42:38:
warning: symbol 'armada_370_xp_system_controller' was not declared. Should it be static?
arch/arm/mach-mvebu/system-controller.c:49:38:
warning: symbol 'orion_system_controller' was not declared. Should it be static?
arch/arm/mach-mvebu/system-controller.c:67:6:
warning: symbol 'mvebu_restart' was not declared. Should it be static?
arch/arm/mach-mvebu/coherency.c:31:15:
warning: symbol 'coherency_phys_base' was not declared. Should it be static?
arch/arm/mach-mvebu/coherency.c:48:5:
warning: symbol 'set_cpu_coherent' was not declared. Should it be static?
arch/arm/mach-mvebu/coherency.c:123:12:
warning: symbol 'coherency_init' was not declared. Should it be static?
arch/arm/mach-mvebu/pmsu.c:38:5: warning:
symbol 'armada_xp_boot_cpu' was not declared. Should it be static?
arch/arm/mach-mvebu/pmsu.c:61:12: warning:
symbol 'armada_370_xp_pmsu_init' was not declared. Should it be static?
arch/arm/mach-mvebu/platsmp.c:49:13: warning:
symbol 'set_secondary_cpus_clock' was not declared. Should it be static?
arch/arm/mach-mvebu/platsmp.c:97:13: warning:
symbol 'armada_xp_smp_prepare_cpus' was not declared. Should it be static?
arch/arm/mach-mvebu/hotplug.c:24:12: warning:
symbol 'armada_xp_cpu_die' was not declared. Should it be static?

Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Acked-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 7805d2bd

arch/arm/mach-mvebu/coherency.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <asm/smp_plat.h>

#include <asm/cacheflush.h>

#include "armada-370-xp.h"

#include "coherency.h"



unsigned long coherency_phys_base;

static void __iomem *coherency_base;

arch/arm/mach-mvebu/coherency.h

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
#ifndef __MACH_370_XP_COHERENCY_H

#define __MACH_370_XP_COHERENCY_H



int set_cpu_coherent(int cpu_id, int smp_group_id);

extern unsigned long coherency_phys_base;



int set_cpu_coherent(unsigned int cpu_id, int smp_group_id);

int coherency_init(void);



#endif	/* __MACH_370_XP_COHERENCY_H */

arch/arm/mach-mvebu/common.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ void armada_370_xp_handle_irq(struct pt_regs *regs); 


void armada_xp_cpu_die(unsigned int cpu);

int armada_370_xp_coherency_init(void);

int armada_370_xp_pmsu_init(void);

void armada_xp_secondary_startup(void);

extern struct smp_operations armada_xp_smp_ops;

#endif

arch/arm/mach-mvebu/hotplug.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/errno.h>

#include <linux/smp.h>

#include <asm/proc-fns.h>

#include "common.h"



/*

 * platform-specific code to shutdown a CPU

arch/arm/mach-mvebu/platsmp.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct clk *__init get_cpu_clk(int cpu) 
	return cpu_clk;

}



void __init set_secondary_cpus_clock(void)

static void __init set_secondary_cpus_clock(void)

{

	int thiscpu, cpu;

	unsigned long rate;
@@ -94,7 +94,7 @@ static void __init armada_xp_smp_init_cpus(void) 
	set_smp_cross_call(armada_mpic_send_doorbell);

}



void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)

static void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)

{

	struct device_node *node;

	struct resource res;