[PATCH 2/6] powernv:stop: Rename pnv_arch300_idle_init to pnv_power9_idle_init

Tim Gardner tim.gardner at canonical.com
Fri Mar 10 13:15:46 UTC 2017

From: "Gautham R. Shenoy" <ego at linux.vnet.ibm.com>

BugLink: http://bugs.launchpad.net/bugs/1666197

Balbir pointed out that the name of the function pnv_arch300_idle_init
was inconsistent with the names of the variables and functions
pertaining to POWER9 features in book3s_idle.S.

This patch renames pnv_arch300_idle_init to pnv_power9_idle_init.

This patch does not change any behaviour.

Cherry-picked from upstream commit dd34c74c97b6 ("powernv:stop: Rename
pnv_arch300_idle_init to pnv_power9_idle_init")

Signed-off-by: Gautham R. Shenoy <ego at linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
 arch/powerpc/platforms/powernv/idle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c
index 479c256..57bec03 100644
--- a/arch/powerpc/platforms/powernv/idle.c
+++ b/arch/powerpc/platforms/powernv/idle.c
@@ -298,7 +298,7 @@ u64 pnv_deepest_stop_state;
  * @dt_idle_states: Number of idle state entries
  * Returns 0 on success
-static int __init pnv_arch300_idle_init(struct device_node *np, u32 *flags,
+static int __init pnv_power9_idle_init(struct device_node *np, u32 *flags,
 					int dt_idle_states)
 	u64 *psscr_val = NULL;
@@ -373,7 +373,7 @@ static void __init pnv_probe_idle_states(void)
 	if (cpu_has_feature(CPU_FTR_ARCH_300)) {
-		if (pnv_arch300_idle_init(np, flags, dt_idle_states))
+		if (pnv_power9_idle_init(np, flags, dt_idle_states))
 			goto out;

More information about the kernel-team mailing list