ARM: EXYNOS: Remove redundant code from regs-pmu.h

Commit 6ec4f8d0d91f ("ARM: EXYNOS: add generic function to calculate
cpu number") introduced exynos_pmu_cpunr to be used by multi-cluster SoCs
e.g. Exynos5420, but it's no more used in the codebase and hence removing
this part of code.

Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c
index 28b7a72ae9a687b954b09dc174357634d404d64d..628ae094ae0cea9e53dbda1b8c194fc5a7791a74 100644 (file)
--- a/arch/arm/mach-exynos/pmu.c
+++ b/arch/arm/mach-exynos/pmu.c
@@ -15,6 +15,8 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 
+#include <asm/cputype.h>
+
 #include "exynos-pmu.h"
 #include "regs-pmu.h"
 

diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index fba9068ed260de7f8211525e772ffc25d7d88f0a..5e4f4c23b06a11d19c377d2a50af373d49d3b5bc 100644 (file)
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -484,15 +484,6 @@
 
 #define EXYNOS5420_SWRESET_KFC_SEL                             0x3
 
-#include <asm/cputype.h>
-#define MAX_CPUS_IN_CLUSTER    4
-
-static inline unsigned int exynos_pmu_cpunr(unsigned int mpidr)
-{
-       return ((MPIDR_AFFINITY_LEVEL(mpidr, 1) * MAX_CPUS_IN_CLUSTER)
-                + MPIDR_AFFINITY_LEVEL(mpidr, 0));
-}
-
 /* Only for EXYNOS5420 */
 #define EXYNOS5420_ISP_ARM_OPTION                              0x2488
 #define EXYNOS5420_L2RSTDISABLE_VALUE                          BIT(3)