leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mvebu cleanup for 4.8 (part 1)

Browse Source 
Various warning fixes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAldpAwMACgkQCwYYjhRyO9WIhACeJQPPSTdBX/Gaa23T1aQT9gwq
 /g8AoJeSQumzfxqnQLCuz86ba4sXQkyx
 =JyAq
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu into next/cleanup

mvebu cleanup for 4.8 (part 1)

Various warning fixes

* tag 'mvebu-cleanup-4.8-1' of git://git.infradead.org/linux-mvebu:
  ARM: Kirkwood: fix kirkwood_pm_init() declaration/type
  ARM: Kirkwood: make kirkwood_disable_mbus_error_propagation() static
  ARM: orion5x: make orion5x_legacy_handle_irq static
  mvebu: add definition for coherency_base
  mvebu: make mvebu_armada375_smp_wa_init() static
  mvebu: fix missing include of common.h in cpu-reset.c
  mvebu: fix missing include of common.h in pm.c
  mvebu: fix missing includes in pmsu.c

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-07-04 20:38:20 -07:00
commit 49a7114fa9
8 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-mvebu/coherency.h
View File

@ -14,6 +14,7 @@
#ifndef __MACH_370_XP_COHERENCY_H
#define __MACH_370_XP_COHERENCY_H
extern void __iomem *coherency_base; /* for coherency_ll.S */
extern unsigned long coherency_phys_base;
int set_cpu_coherent(void);

2
arch/arm/mach-mvebu/cpu-reset.c
View File

@ -16,6 +16,8 @@
#include <linux/io.h>
#include <linux/resource.h>
#include "common.h"
static void __iomem *cpu_reset_base;
static size_t cpu_reset_size;

4
arch/arm/mach-mvebu/kirkwood-pm.c
View File

@ -18,6 +18,7 @@
#include <linux/suspend.h>
#include <linux/io.h>
#include "kirkwood.h"
#include "kirkwood-pm.h"
static void __iomem *ddr_operation_base;
static void __iomem *memory_pm_ctrl;
@ -66,11 +67,10 @@ static const struct platform_suspend_ops kirkwood_suspend_ops = {
.valid = kirkwood_pm_valid_standby,
};
int __init kirkwood_pm_init(void)
void __init kirkwood_pm_init(void)
{
ddr_operation_base = ioremap(DDR_OPERATION_BASE, 4);
memory_pm_ctrl = ioremap(MEMORY_PM_CTRL_PHYS, 4);
suspend_set_ops(&kirkwood_suspend_ops);
return 0;
}

2
arch/arm/mach-mvebu/kirkwood.c
View File

@ -150,7 +150,7 @@ eth_fixup_skip:
* causes mbus errors (which can occur for example for PCI aborts) to
* throw CPU aborts, which we're not set up to deal with.
*/
void kirkwood_disable_mbus_error_propagation(void)
static void kirkwood_disable_mbus_error_propagation(void)
{
void __iomem *cpu_config;

1
arch/arm/mach-mvebu/pm.c
View File

@ -23,6 +23,7 @@
#include <asm/suspend.h>
#include "coherency.h"
#include "common.h"
#include "pmsu.h"
#define SDRAM_CONFIG_OFFS 0x0

3
arch/arm/mach-mvebu/pmsu.c
View File

@ -25,6 +25,7 @@
#include <linux/io.h>
#include <linux/kernel.h>
#include <linux/mbus.h>
#include <linux/mvebu-pmsu.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@ -38,7 +39,7 @@
#include <asm/suspend.h>
#include <asm/tlbflush.h>
#include "common.h"
#include "pmsu.h"
#define PMSU_BASE_OFFSET 0x100
#define PMSU_REG_SIZE 0x1000

2
arch/arm/mach-mvebu/system-controller.c
View File

@ -127,7 +127,7 @@ int mvebu_system_controller_get_soc_id(u32 *dev, u32 *rev)
}
#if defined(CONFIG_SMP) && defined(CONFIG_MACH_MVEBU_V7)
void mvebu_armada375_smp_wa_init(void)
static void mvebu_armada375_smp_wa_init(void)
{
u32 dev, rev;
phys_addr_t resume_addr_reg;

2
arch/arm/mach-orion5x/irq.c
View File

@ -26,7 +26,7 @@ static int __initdata gpio0_irqs[4] = {
IRQ_ORION5X_GPIO_24_31,
};
asmlinkage void
static asmlinkage void
__exception_irq_entry orion5x_legacy_handle_irq(struct pt_regs *regs)
{
u32 stat;