From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rjw@rjwysocki.net, lorenzo.pieralisi@arm.com
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
Catalin.Marinas@arm.com, robherring2@gmail.com, arnd@arndb.de,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
lina.iyer@linaro.org, sboyd@codeaurora.org
Subject: [PATCH V3 8/8] ARM: cpuidle: Change function name to be consistent with x86
Date: Fri, 20 Mar 2015 12:44:01 +0100 [thread overview]
Message-ID: <1426851841-2072-9-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1426851841-2072-1-git-send-email-daniel.lezcano@linaro.org>
Change the functions name:
arm_cpuidle_suspend => arm_idle
arm_cpuidle_init => arm_idle_cpu_init
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
arch/arm/include/asm/cpuidle.h | 4 ++--
arch/arm/kernel/cpuidle.c | 4 ++--
arch/arm64/include/asm/cpuidle.h | 6 +++---
arch/arm64/kernel/cpuidle.c | 2 +-
drivers/cpuidle/cpuidle-arm.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h
index 0f84249..5f547c0 100644
--- a/arch/arm/include/asm/cpuidle.h
+++ b/arch/arm/include/asm/cpuidle.h
@@ -44,8 +44,8 @@ struct of_cpuidle_method {
__used __section(__cpuidle_method_of_table) \
= { .method = _method, .ops = _ops }
-extern int arm_cpuidle_suspend(int index);
+extern int arm_idle(int index);
-extern int arm_cpuidle_init(int cpu);
+extern int arm_idle_cpu_init(int cpu);
#endif
diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 7b42a40..05a2c3e 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -29,7 +29,7 @@ int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
return index;
}
-int arm_cpuidle_suspend(int index)
+int arm_idle(int index)
{
int ret = -EOPNOTSUPP;
int cpu = smp_processor_id();
@@ -75,7 +75,7 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu)
return 0;
}
-int __init arm_cpuidle_init(int cpu)
+int __init arm_idle_cpu_init(int cpu)
{
int ret = -EOPNOTSUPP;
struct device_node *cpu_node = of_cpu_device_node_get(cpu);
diff --git a/arch/arm64/include/asm/cpuidle.h b/arch/arm64/include/asm/cpuidle.h
index 141b2fc..e9c0dc4e 100644
--- a/arch/arm64/include/asm/cpuidle.h
+++ b/arch/arm64/include/asm/cpuidle.h
@@ -4,10 +4,10 @@
#include <asm/proc-fns.h>
#ifdef CONFIG_CPU_IDLE
-extern int arm_cpuidle_init(unsigned int cpu);
+extern int arm_idle_cpu_init(unsigned int cpu);
extern int cpu_suspend(unsigned long arg);
#else
-static inline int arm_cpuidle_init(unsigned int cpu)
+static inline int arm_idle_cpu_init(unsigned int cpu)
{
return -EOPNOTSUPP;
}
@@ -17,7 +17,7 @@ static inline int cpu_suspend(unsigned long arg)
return -EOPNOTSUPP;
}
#endif
-static inline int arm_cpuidle_suspend(int index)
+static inline int arm_idle(int index)
{
return cpu_suspend(index);
}
diff --git a/arch/arm64/kernel/cpuidle.c b/arch/arm64/kernel/cpuidle.c
index a78143a..b6b4fcf 100644
--- a/arch/arm64/kernel/cpuidle.c
+++ b/arch/arm64/kernel/cpuidle.c
@@ -15,7 +15,7 @@
#include <asm/cpuidle.h>
#include <asm/cpu_ops.h>
-int arm_cpuidle_init(unsigned int cpu)
+int arm_idle_cpu_init(unsigned int cpu)
{
int ret = -EOPNOTSUPP;
struct device_node *cpu_node = of_cpu_device_node_get(cpu);
diff --git a/drivers/cpuidle/cpuidle-arm.c b/drivers/cpuidle/cpuidle-arm.c
index e4a6eba..37c732d 100644
--- a/drivers/cpuidle/cpuidle-arm.c
+++ b/drivers/cpuidle/cpuidle-arm.c
@@ -50,7 +50,7 @@ static int arm_enter_idle_state(struct cpuidle_device *dev,
* call the CPU ops suspend protocol with idle index as a
* parameter.
*/
- arm_cpuidle_suspend(idx);
+ arm_idle(idx);
cpu_pm_exit();
}
@@ -118,7 +118,7 @@ static int __init arm_idle_init(void)
* idle states suspend back-end specific data
*/
for_each_possible_cpu(cpu) {
- ret = arm_cpuidle_init(cpu);
+ ret = arm_idle_cpu_init(cpu);
/* This cpu does not support any idle states */
if (ret == -ENXIO)
--
1.9.1
next prev parent reply other threads:[~2015-03-20 11:44 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-20 11:43 [PATCH V3 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Daniel Lezcano
2015-03-20 11:43 ` [PATCH V3 2/8] ARM: cpuidle: Add a cpuidle ops structure to be used for DT Daniel Lezcano
2015-03-25 21:34 ` Stephen Boyd
2015-03-20 11:43 ` [PATCH V3 3/8] ARM64: cpuidle: Replace cpu_suspend by the common ARM/ARM64 function Daniel Lezcano
2015-03-20 11:43 ` [PATCH V3 4/8] ARM64: cpuidle: Rename cpu_init_idle to a common function name Daniel Lezcano
2015-03-21 20:24 ` Lorenzo Pieralisi
2015-03-20 11:43 ` [PATCH V3 5/8] ARM64: cpuidle: Remove arm64 reference Daniel Lezcano
2015-03-21 20:21 ` Lorenzo Pieralisi
[not found] ` <1426851841-2072-1-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-03-20 11:43 ` [PATCH V3 1/8] ARM: cpuidle: Remove duplicate header inclusion Daniel Lezcano
2015-03-20 11:43 ` [PATCH V3 6/8] ARM: cpuidle: Enable the ARM64 driver for both ARM32/ARM64 Daniel Lezcano
2015-03-21 20:20 ` Lorenzo Pieralisi
2015-03-20 11:44 ` [PATCH V3 7/8] ARM: cpuidle: Register per cpuidle device Daniel Lezcano
2015-03-21 20:35 ` Lorenzo Pieralisi
2015-03-23 14:42 ` Daniel Lezcano
2015-03-23 15:41 ` Daniel Lezcano
2015-03-23 16:25 ` Lorenzo Pieralisi
2015-03-23 16:50 ` [PATCH V4] " Daniel Lezcano
2015-03-23 22:58 ` Lorenzo Pieralisi
2015-03-24 9:54 ` [PATCH V5 1/2] " Daniel Lezcano
2015-03-24 9:54 ` [PATCH 2/2] ARM: cpuidle: Document the code Daniel Lezcano
2015-03-24 18:51 ` Lorenzo Pieralisi
2015-03-24 19:04 ` Lorenzo Pieralisi
2015-03-25 7:03 ` Daniel Lezcano
2015-03-24 18:10 ` [PATCH V5 1/2] ARM: cpuidle: Register per cpuidle device Lorenzo Pieralisi
2015-03-20 11:44 ` Daniel Lezcano [this message]
2015-03-21 20:09 ` [PATCH V3 8/8] ARM: cpuidle: Change function name to be consistent with x86 Lorenzo Pieralisi
2015-03-20 18:31 ` [PATCH V3 0/8] ARM: cpuidle: Unify the ARM64/ARM DT approach Lorenzo Pieralisi
2015-03-20 18:39 ` Daniel Lezcano
2015-03-21 20:51 ` Lorenzo Pieralisi
2015-03-23 15:27 ` Lorenzo Pieralisi
2015-03-23 15:31 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426851841-2072-9-git-send-email-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=Catalin.Marinas@arm.com \
--cc=arnd@arndb.de \
--cc=devicetree@vger.kernel.org \
--cc=lina.iyer@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robherring2@gmail.com \
--cc=sboyd@codeaurora.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).