[PATCH 2/3] cpu/hotplug: Remove disable_nonboot_cpus()

[Qais Yousef]

The single user could have called freeze_secondary_cpus() directly.

Since this function was a source of confusion, remove it as it's
just a pointless wrapper.

Signed-off-by: Qais Yousef <qais.yousef@xxxxxxx>
CC: "Rafael J. Wysocki" <rjw@xxxxxxxxxxxxx>
CC: Len Brown <len.brown@xxxxxxxxx>
CC: Pavel Machek <pavel@xxxxxx>
CC: Ingo Molnar <mingo@xxxxxxxxxx>
CC: Borislav Petkov <bp@xxxxxxxxx>
CC: "H. Peter Anvin" <hpa@xxxxxxxxx>
CC: x86@xxxxxxxxxx
CC: Todd E Brandt <todd.e.brandt@xxxxxxxxxxxxxxx>
CC: linux-pm@xxxxxxxxxxxxxxx
CC: linux-kernel@xxxxxxxxxxxxxxx
---
 Documentation/power/suspend-and-cpuhotplug.rst | 4 ++--
 arch/x86/power/cpu.c                           | 2 +-
 include/linux/cpu.h                            | 5 -----
 kernel/cpu.c                                   | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Documentation/power/suspend-and-cpuhotplug.rst b/Documentation/power/suspend-and-cpuhotplug.rst
index 572d968c5375..79f7610a6f6f 100644
--- a/Documentation/power/suspend-and-cpuhotplug.rst
+++ b/Documentation/power/suspend-and-cpuhotplug.rst
@@ -48,7 +48,7 @@ More details follow::
                                         |
                                         |
                                         v
-                              disable_nonboot_cpus()
+                              freeze_secondary_cpus()
                                    /* start */
                                         |
                                         v
@@ -83,7 +83,7 @@ More details follow::
                             Release cpu_add_remove_lock
                                         |
                                         v
-                       /* disable_nonboot_cpus() complete */
+                       /* freeze_secondary_cpus() complete */
                                         |
                                         v
                                    Do suspend
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 915bb1639763..e0a9ad8829b0 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -307,7 +307,7 @@ int hibernate_resume_nonboot_cpu_disable(void)
 	if (ret)
 		return ret;
 	smp_ops.play_dead = resume_play_dead;
-	ret = disable_nonboot_cpus();
+	ret = freeze_secondary_cpus(0);
 	smp_ops.play_dead = play_dead;
 	return ret;
 }
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 9ead281157d3..a00941c7828b 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -145,10 +145,6 @@ static inline void put_online_cpus(void) { cpus_read_unlock(); }
 
 #ifdef CONFIG_PM_SLEEP_SMP
 extern int freeze_secondary_cpus(int primary);
-static inline int disable_nonboot_cpus(void)
-{
-	return freeze_secondary_cpus(0);
-}
 extern void enable_nonboot_cpus(void);
 
 static inline int suspend_disable_secondary_cpus(void)
@@ -166,7 +162,6 @@ static inline void suspend_enable_secondary_cpus(void)
 }
 
 #else /* !CONFIG_PM_SLEEP_SMP */
-static inline int disable_nonboot_cpus(void) { return 0; }
 static inline void enable_nonboot_cpus(void) {}
 static inline int suspend_disable_secondary_cpus(void) { return 0; }
 static inline void suspend_enable_secondary_cpus(void) { }
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 30848496cbc7..d6d2c829561e 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1376,7 +1376,7 @@ int freeze_secondary_cpus(int primary)
 
 	/*
 	 * Make sure the CPUs won't be enabled by someone else. We need to do
-	 * this even in case of failure as all disable_nonboot_cpus() users are
+	 * this even in case of failure as all freeze_secondary_cpus() users are
 	 * supposed to do enable_nonboot_cpus() on the failure path.
 	 */
 	cpu_hotplug_disabled++;
-- 
2.17.1