[linux-yocto] [PATCH 21/52] arch/arm/mach-axxia: Fix Compiler Warnings

[Daniel Dragomir]

From: John Jacques <john.jacques at lsi.com>

Fixes compilation warnings introduced by:
- LSI ACP34XX: Update new Axxia GIC Driver
  commit ba251fcf654cd1f17e72a17f7e0ea903f33f92e0
  author: David Mercado
- arch/arm/mach-axxia: Support for CPU Hotplug
  commit ef5cfa9d171bb7525ecd24b1de34342915645a93
  author: John Jacques

See below the warning messages:

arch/arm/mach-axxia/axxia-gic.c:51:0: warning: "MAX_NUM_CLUSTERS"
redefined [enabled by default]
 #define MAX_NUM_CLUSTERS    4
 ^
In file included from arch/arm/mach-axxia/axxia-gic.c:48:0:
arch/arm/mach-axxia/lsi_power_management.h:156:0: note: this is the
location of the previous definition
 #define MAX_NUM_CLUSTERS    (4)
 ^
arch/arm/mach-axxia/axxia-gic.c:52:0: warning: "CORES_PER_CLUSTER"
redefined [enabled by default]
 #define CORES_PER_CLUSTER   4
 ^
In file included from arch/arm/mach-axxia/axxia-gic.c:48:0:
arch/arm/mach-axxia/lsi_power_management.h:157:0: note: this is the
location of the previous definition
 #define CORES_PER_CLUSTER   (4)
 ^
arch/arm/mach-axxia/axxia-gic.c: In function
'axxia_hotplug_gic_secondary_init':
arch/arm/mach-axxia/axxia-gic.c:1369:24: warning: unused variable 'gic'
[-Wunused-variable]
  struct gic_chip_data *gic = &gic_data;

Signed-off-by: John Jacques <john.jacques at lsi.com>
---
 arch/arm/mach-axxia/axxia-gic.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-axxia/axxia-gic.c b/arch/arm/mach-axxia/axxia-gic.c
index c670f3d..29a80f6 100644
--- a/arch/arm/mach-axxia/axxia-gic.c
+++ b/arch/arm/mach-axxia/axxia-gic.c
@@ -48,8 +48,6 @@
 #include "lsi_power_management.h"
 
 #define MAX_GIC_INTERRUPTS  1020
-#define MAX_NUM_CLUSTERS    4
-#define CORES_PER_CLUSTER   4
 
 static u32 irq_cpuid[MAX_GIC_INTERRUPTS];
 static void __iomem *ipi_mask_reg_base;
@@ -1366,7 +1364,6 @@ void __cpuinit axxia_gic_secondary_init(void)
 
 void __cpuinit axxia_hotplug_gic_secondary_init(void)
 {
-	struct gic_chip_data *gic = &gic_data;
 	gic_cpu_init(&gic_data);
 }
 
-- 
1.8.1.4