From ed22bb8d39fa7f3980afc6e16d2a891847367d33 Mon Sep 17 00:00:00 2001

From: Nathan Lynch <nathanl@linux.ibm.com>

Date: Mon, 7 Dec 2020 15:51:51 -0600

Subject: [PATCH] powerpc/pseries/hibernation: remove pseries_suspend_cpu()

References: bsc#1181674 ltc#189159

Patch-mainline: v5.11-rc1

Git-commit: ed22bb8d39fa7f3980afc6e16d2a891847367d33

Since commit 48f6e7f6d948 ("powerpc/pseries: remove cede offline state

for CPUs"), ppc_md.suspend_disable_cpu() is no longer used and all

CPUs (save one) are placed into true offline state as opposed to

H_JOIN. So pseries_suspend_cpu() is effectively unused; remove it.

Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

Link: https://lore.kernel.org/r/20201207215200.1785968-20-nathanl@linux.ibm.com

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 arch/powerpc/platforms/pseries/suspend.c | 15 ---------------

 1 file changed, 15 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c

index 232621f33510..3315d698d5ab 100644

--- a/arch/powerpc/platforms/pseries/suspend.c

+++ b/arch/powerpc/platforms/pseries/suspend.c

@@ -48,20 +48,6 @@ static int pseries_suspend_begin(u64 stream_id)

 		       vasi_state);

 		return -EIO;

 	}

-

-	return 0;

-}

-

-/**

- * pseries_suspend_cpu - Suspend a single CPU

- *

- * Makes the H_JOIN call to suspend the CPU

- *

- **/

-static int pseries_suspend_cpu(void)

-{

-	if (atomic_read(&suspending))

-		return rtas_suspend_cpu(&suspend_data);

 	return 0;

 }

@@ -235,7 +221,6 @@ static int __init pseries_suspend_init(void)

 	if ((rc = pseries_suspend_sysfs_register(&suspend_dev)))

 		return rc;

-	ppc_md.suspend_disable_cpu = pseries_suspend_cpu;

 	ppc_md.suspend_enable_irqs = pseries_suspend_enable_irqs;

 	suspend_set_ops(&pseries_suspend_ops);

 	return 0;

-- 

2.26.2