[GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.3

[GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.3

[Simon Horman]

Hi Olof, Hi Kevin, Hi Arnd,

Please consider these second round of Renesas ARM based SoC cleanup for v4.3.

This pull request is based on the previous round of
such requests, tagged as renesas-cleanup-for-v4.3,
which I have already sent a pull-request for.


The following changes since commit 20834a406ee20b57c796f9911f06600b71c75788:

  ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only (2015-07-06 09:29:46 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v4.3

for you to fetch changes up to 151dd346a2dadaa151d5110553e3fb08774c888e:

  ARM: shmobile: apmu: silence build warnings (2015-07-14 16:35:24 +0900)

----------------------------------------------------------------
Second Round of Renesas ARM Based SoC Cleanup for v4.3

* Silence APMU build warnings

----------------------------------------------------------------
Wolfram Sang (1):
      ARM: shmobile: apmu: silence build warnings

 arch/arm/mach-shmobile/platsmp-apmu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[PATCH] ARM: shmobile: apmu: silence build warnings

[Simon Horman]

From: Wolfram Sang <wsa+renesas@sang-engineering.com>

With shmobile_defconfig but SMP=n && SUSPEND=n, I get:

arch/arm/mach-shmobile/platsmp-apmu.c:49:12: warning: 'apmu_power_off' defined but not used [-Wunused-function]
arch/arm/mach-shmobile/platsmp-apmu.c:70:12: warning: 'apmu_wrap' defined but not used [-Wunused-function]

Annotate those functions like the functions around it.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/platsmp-apmu.c | 4 ++--
 1 file 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;
 
-- 
2.1.4

[GIT PULL] Second Round of Renesas ARM Based SoC Cleanup for v4.3

[Olof Johansson]

On Fri, Jul 24, 2015 at 05:41:15PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these second round of Renesas ARM based SoC cleanup for v4.3.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-cleanup-for-v4.3,
> which I have already sent a pull-request for.
> 
> 
> The following changes since commit 20834a406ee20b57c796f9911f06600b71c75788:
> 
>   ARM: shmobile: timer: r8a73a4 and r8a7790 are multi-platform only (2015-07-06 09:29:46 +0900)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v4.3
> 
> for you to fetch changes up to 151dd346a2dadaa151d5110553e3fb08774c888e:
> 
>   ARM: shmobile: apmu: silence build warnings (2015-07-14 16:35:24 +0900)

Thanks, merged.


-Olof