powerpc/rtas: remove unused rtas_suspend_last_cpu()

rtas_suspend_last_cpu() is now unused, remove it and
__rtas_suspend_last_cpu() which also becomes unused.

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-24-nathanl@linux.ibm.com

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 97ccb40fb09f23eb799e247046885411c01be8d2..332e1000ca0ff503a2f079b52c4ebe703b74f819 100644 (file)
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -256,7 +256,6 @@ extern bool rtas_indicator_present(int token, int *maxindex);
 extern int rtas_set_indicator(int indicator, int index, int new_value);
 extern int rtas_set_indicator_fast(int indicator, int index, int new_value);
 extern void rtas_progress(char *s, unsigned short hex);
-extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
 int rtas_ibm_suspend_me(int *fw_status);
 
 struct rtc_time;

diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index aedd46967b99e8fd3dcb1cc4bbe0da0800e010dd..9a7d1bba3ef7508858a03a18205196320c341441 100644 (file)
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -830,49 +830,6 @@ void rtas_activate_firmware(void)
 
 static int ibm_suspend_me_token = RTAS_UNKNOWN_SERVICE;
 #ifdef CONFIG_PPC_PSERIES
-static int __rtas_suspend_last_cpu(struct rtas_suspend_me_data *data, int wake_when_done)
-{
-       u16 slb_size = mmu_slb_size;
-       int rc = H_MULTI_THREADS_ACTIVE;
-       int cpu;
-
-       slb_set_size(SLB_MIN_SIZE);
-       printk(KERN_DEBUG "calling ibm,suspend-me on cpu %i\n", smp_processor_id());
-
-       while (rc == H_MULTI_THREADS_ACTIVE && !atomic_read(&data->done) &&
-              !atomic_read(&data->error))
-               rc = rtas_call(data->token, 0, 1, NULL);
-
-       if (rc || atomic_read(&data->error)) {
-               printk(KERN_DEBUG "ibm,suspend-me returned %d\n", rc);
-               slb_set_size(slb_size);
-       }
-
-       if (atomic_read(&data->error))
-               rc = atomic_read(&data->error);
-
-       atomic_set(&data->error, rc);
-       pSeries_coalesce_init();
-
-       if (wake_when_done) {
-               atomic_set(&data->done, 1);
-
-               for_each_online_cpu(cpu)
-                       plpar_hcall_norets(H_PROD, get_hard_smp_processor_id(cpu));
-       }
-
-       if (atomic_dec_return(&data->working) == 0)
-               complete(data->complete);
-
-       return rc;
-}
-
-int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data)
-{
-       atomic_inc(&data->working);
-       return __rtas_suspend_last_cpu(data, 0);
-}
-
 /**
  * rtas_call_reentrant() - Used for reentrant rtas calls
  * @token:     Token for desired reentrant RTAS call