From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbbCTQBH (ORCPT ); Fri, 20 Mar 2015 12:01:07 -0400 Received: from mail-wg0-f52.google.com ([74.125.82.52]:36611 "EHLO mail-wg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751033AbbCTQBF (ORCPT ); Fri, 20 Mar 2015 12:01:05 -0400 Message-ID: <550C443C.8060305@linaro.org> Date: Fri, 20 Mar 2015 17:01:00 +0100 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Catalin.Marinas@arm.com CC: lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, robherring2@gmail.com, arnd@arndb.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lina.iyer@linaro.org Subject: Re: [PATCH 4/6] ARM64: cpuidle: Rename cpu_init_idle to a common function name References: <1425385777-14766-1-git-send-email-daniel.lezcano@linaro.org> <1425385777-14766-5-git-send-email-daniel.lezcano@linaro.org> In-Reply-To: <1425385777-14766-5-git-send-email-daniel.lezcano@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/03/2015 01:29 PM, Daniel Lezcano wrote: > With this change the cpuidle-arm64.c file calls the same function name > for both ARM and ARM64. > > Signed-off-by: Daniel Lezcano Hi Catalin, do you mind to ack the ARM64 if you agree with these changes ? Thanks. -- Daniel > --- > arch/arm64/include/asm/cpuidle.h | 4 ++-- > arch/arm64/kernel/cpuidle.c | 2 +- > drivers/cpuidle/cpuidle-arm64.c | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h > index 1bee287..2bc2732 100644 > --- a/arch/arm64/include/asm/cpuidle.h > +++ b/arch/arm64/include/asm/cpuidle.h > @@ -2,10 +2,10 @@ > #define __ASM_CPUIDLE_H > > #ifdef CONFIG_CPU_IDLE > -extern int cpu_init_idle(unsigned int cpu); > +extern int arm_cpuidle_init(unsigned int cpu); > extern int cpu_suspend(unsigned long arg); > #else > -static inline int cpu_init_idle(unsigned int cpu) > +static inline int arm_cpuidle_init(unsigned int cpu) > { > return -EOPNOTSUPP; > } > diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c > index 5c08966..a78143a 100644 > --- a/arch/arm64/kernel/cpuidle.c > +++ b/arch/arm64/kernel/cpuidle.c > @@ -15,7 +15,7 @@ > #include > #include > > -int cpu_init_idle(unsigned int cpu) > +int arm_cpuidle_init(unsigned int cpu) > { > int ret = -EOPNOTSUPP; > struct device_node *cpu_node = of_cpu_device_node_get(cpu); > diff --git a/drivers/cpuidle/cpuidle-arm64.c b/drivers/cpuidle/cpuidle-arm64.c > index 0cea244..6ef291c7 100644 > --- a/drivers/cpuidle/cpuidle-arm64.c > +++ b/drivers/cpuidle/cpuidle-arm64.c > @@ -110,7 +110,7 @@ static int __init arm64_idle_init(void) > * idle states suspend back-end specific data > */ > for_each_possible_cpu(cpu) { > - ret = cpu_init_idle(cpu); > + ret = arm_cpuidle_init(cpu); > if (ret) { > pr_err("CPU %d failed to init idle CPU ops\n", cpu); > return ret; > -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog