From: Gautham R. Shenoy Date: Wed, 25 Jan 2017 08:36:26 +0000 (+0530) Subject: powernv:stop: Rename pnv_arch300_idle_init to pnv_power9_idle_init X-Git-Tag: Ubuntu-4.10.0-10.12~26 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=16f095a8854c81b475a082be007e5533cae8a1af;p=mirror_ubuntu-zesty-kernel.git powernv:stop: Rename pnv_arch300_idle_init to pnv_power9_idle_init 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. Signed-off-by: Gautham R. Shenoy Signed-off-by: Michael Ellerman (cherry picked from linux-next commit dd34c74c97b6c3ed1ac7caec0b46267142659aff) Signed-off-by: Tim Gardner --- diff --git a/arch/powerpc/platforms/powernv/idle.c b/arch/powerpc/platforms/powernv/idle.c index 479c25601612..57bec031291b 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; }