diff options
| author | Olof Johansson | 2015-07-27 14:27:13 +0200 |
|---|---|---|
| committer | Olof Johansson | 2015-07-27 14:27:13 +0200 |
| commit | a1156814606c0bd5f8725ff7feac21e58bc3b16d (patch) | |
| tree | 31a3d3675e3afa5e459bd6c7413786901623e02b | |
| parent | Merge tag 'omap-for-v4.3/legacy-v2-signed' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | ARM: shmobile: apmu: silence build warnings (diff) | |
| download | kernel-qcow2-linux-a1156814606c0bd5f8725ff7feac21e58bc3b16d.tar.gz kernel-qcow2-linux-a1156814606c0bd5f8725ff7feac21e58bc3b16d.tar.xz kernel-qcow2-linux-a1156814606c0bd5f8725ff7feac21e58bc3b16d.zip | |
Merge tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Second Round of Renesas ARM Based SoC Cleanup for v4.3
* Silence APMU build warnings
* tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: apmu: silence build warnings
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp-apmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index b0790fc32282..4e54512bee30 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -46,7 +46,7 @@ static int __maybe_unused apmu_power_on(void __iomem *p, int bit) return 0; } -static int apmu_power_off(void __iomem *p, int bit) +static int __maybe_unused apmu_power_off(void __iomem *p, int bit) { /* request Core Standby for next WFI */ writel_relaxed(3, p + CPUNCR_OFFS(bit)); @@ -67,7 +67,7 @@ static int __maybe_unused apmu_power_off_poll(void __iomem *p, int bit) return 0; } -static int apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu)) +static int __maybe_unused apmu_wrap(int cpu, int (*fn)(void __iomem *p, int cpu)) { void __iomem *p = apmu_cpus[cpu].iomem; |