ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"

This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.

Signed-off-by Pankaj Dubey <[email protected]>

---
 arch/arm/mach-exynos/pmu.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

arch/arm/mach-exynos/pmu.c +4 -5

index cfc62e8..e5e1846 100644
@@ -330,7 +330,7 @@ static unsigned int const exynos5_list_both_cnt_feed[] = {
 	EXYNOS5_TOP_PWR_SYSMEM_OPTION,
 };
 
-static unsigned int const exynos5_list_diable_wfi_wfe[] = {
+static unsigned int const exynos5_list_disable_wfi_wfe[] = {
 	EXYNOS5_ARM_CORE1_OPTION,
 	EXYNOS5_FSYS_ARM_OPTION,
 	EXYNOS5_ISP_ARM_OPTION,

@@ -361,11 +361,11 @@ static void exynos5_init_pmu(void)
 	/*
 	 * Disable WFI/WFE on XXX_OPTION
 	 */
-	for (i = 0 ; i < ARRAY_SIZE(exynos5_list_diable_wfi_wfe) ; i++) {
-		tmp = pmu_raw_readl(exynos5_list_diable_wfi_wfe[i]);
+	for (i = 0 ; i < ARRAY_SIZE(exynos5_list_disable_wfi_wfe) ; i++) {
+		tmp = pmu_raw_readl(exynos5_list_disable_wfi_wfe[i]);
 		tmp &= ~(EXYNOS5_OPTION_USE_STANDBYWFE |
 			 EXYNOS5_OPTION_USE_STANDBYWFI);
-		pmu_raw_writel(tmp, exynos5_list_diable_wfi_wfe[i]);
+		pmu_raw_writel(tmp, exynos5_list_disable_wfi_wfe[i]);
 	}
 }
 
--

1.7.9.5

This patch fixes a typo in struct named as "exynos5_list_diable_wfi_wfe" by making it "exynos5_list_disable_wfi_wfe" which is more meaningful.

Signed-off-by Pankaj Dubey <[email protected]>

After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver support for Exynos PMU" [0] does not apply cleanly anymore.

Hello Kukjin,

Quoted 4 lines

After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver support for Exynos PMU" [0] does not apply cleanly anymore.

I see that you already picked all the Exynos S2R patches on your v3.19-next/mach-exynos branch and also resolved that conflict.

Is just that this branch was not merged in your for-next branch and that's why I didn't see the patches in linux-next.

Sorry for the noise.

Subject: Re: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"

Quoted 3 lines · Javier Martinez Canillas

Hello Kukjin,

Quoted 1 line

Quoted 7 lines

Quoted 3 lines

After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver support for Exynos PMU" [0] does not apply cleanly anymore.

I see that you already picked all the Exynos S2R patches on your v3.19-next/mach-exynos branch and also resolved that conflict.

Yes, but I couldn't merge it into -next because of some conflicts between

mach-exynos branch at that time.

Note I've merged into -next just now, so if any problems in -next, please

Quoted 4 lines

Is just that this branch was not merged in your for-next branch and that's why I didn't see the patches in linux-next.

Sorry for the noise.

No problem, thanks.

- Kukjin

Hi Kukijin,

Quoted 7 lines

Subject: Re: [PATCH] ARM: EXYNOS: fix typo in static struct name "exynos5_list_diable_wfi_wfe"

Quoted 3 lines · Javier Martinez Canillas

Hello Kukjin,

Quoted 1 line

Quoted 8 lines

Quoted 7 lines

Quoted 3 lines

After this patch, "[PATCH v9 1/2] ARM: EXYNOS: Add platform driver support for Exynos PMU" [0] does not apply cleanly anymore.

I see that you already picked all the Exynos S2R patches on your v3.19-next/mach-exynos branch and also resolved that conflict.

Yes, but I couldn't merge it into -next because of some conflicts between

for-next and

Quoted 3 lines

mach-exynos branch at that time.

Note I've merged into -next just now, so if any problems in -next, please

let us know.

Quoted 1 line

I just checked and your for-next failed to compile for exynos_defconfig. I got following error:
----------
<stdin>:1247:2: warning: #warning syscall bpf not implemented [-Wcpp]
CHK include/generated/compile.h
CC arch/arm/mach-exynos/platsmp.o
arch/arm/mach-exynos/platsmp.c:448:13: error: static declaration of 'exynos_cpu_die' follows non-static declaration
static void exynos_cpu_die(unsigned int cpu)

             ^
In file included from arch/arm/mach-exynos/platsmp.c:32:0:
arch/arm/mach-exynos/common.h:142:13: note: previous declaration of
'exynos_cpu_die' was here
 extern void exynos_cpu_die(unsigned int cpu);
             ^

make[1]: *** [arch/arm/mach-exynos/platsmp.o] Error 1
make: *** [arch/arm/mach-exynos] Error 2
make: *** Waiting for unfinished jobs....
--------------------------

With following fix I am able to build the for-next.
----------------------------------------------------------------------------
--

arch/arm/mach-exynos/common.h +0 -2

index 2ce225b..472417c 100644
@@ -139,7 +139,6 @@ extern struct smp_operations exynos_smp_ops;
 extern void exynos_cpu_resume(void);
 extern void exynos_cpu_resume_ns(void);
 
-extern void exynos_cpu_die(unsigned int cpu);
 extern void exynos_cpu_power_down(int cpu);
 extern void exynos_cpu_power_up(int cpu);
 extern int  exynos_cpu_power_state(int cpu);
-------------------------------------------------------------------------

Let me know if I have to do something? else please update according to above change.