powerpc/rtas: remove rtas_ibm_suspend_me_unsafe()

rtas_ibm_suspend_me_unsafe() is now unused; remove it and
rtas_percpu_suspend_me() which becomes unused as a result.

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

diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index 3b52d8574fcccbd2a014dccdc35f500a4fe326d3..9a6107ffe378d34b2eab9b4e9f71ae1d5ea54c29 100644 (file)
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -258,7 +258,6 @@ 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_cpu(struct rtas_suspend_me_data *data);
 extern int rtas_suspend_last_cpu(struct rtas_suspend_me_data *data);
-int rtas_ibm_suspend_me_unsafe(u64 handle);
 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 d4b048571728a88cfefe6d585cd7efb7b2dec272..7e6024f570da989da35dbca969859480bef97938 100644 (file)
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -925,66 +925,6 @@ int rtas_suspend_cpu(struct rtas_suspend_me_data *data)
        return __rtas_suspend_cpu(data, 0);
 }
 
-static void rtas_percpu_suspend_me(void *info)
-{
-       __rtas_suspend_cpu((struct rtas_suspend_me_data *)info, 1);
-}
-
-int rtas_ibm_suspend_me_unsafe(u64 handle)
-{
-       long state;
-       long rc;
-       unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-       struct rtas_suspend_me_data data;
-       DECLARE_COMPLETION_ONSTACK(done);
-
-       if (!rtas_service_present("ibm,suspend-me"))
-               return -ENOSYS;
-
-       /* Make sure the state is valid */
-       rc = plpar_hcall(H_VASI_STATE, retbuf, handle);
-
-       state = retbuf[0];
-
-       if (rc) {
-               printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned %ld\n",rc);
-               return rc;
-       } else if (state == H_VASI_ENABLED) {
-               return -EAGAIN;
-       } else if (state != H_VASI_SUSPENDING) {
-               printk(KERN_ERR "rtas_ibm_suspend_me: vasi_state returned state %ld\n",
-                      state);
-               return -EIO;
-       }
-
-       atomic_set(&data.working, 0);
-       atomic_set(&data.done, 0);
-       atomic_set(&data.error, 0);
-       data.token = rtas_token("ibm,suspend-me");
-       data.complete = &done;
-
-       lock_device_hotplug();
-
-       cpu_hotplug_disable();
-
-       /* Call function on all CPUs.  One of us will make the
-        * rtas call
-        */
-       on_each_cpu(rtas_percpu_suspend_me, &data, 0);
-
-       wait_for_completion(&done);
-
-       if (atomic_read(&data.error) != 0)
-               printk(KERN_ERR "Error doing global join\n");
-
-
-       cpu_hotplug_enable();
-
-       unlock_device_hotplug();
-
-       return atomic_read(&data.error);
-}
-
 /**
  * rtas_call_reentrant() - Used for reentrant rtas calls
  * @token:     Token for desired reentrant RTAS call
@@ -1035,12 +975,7 @@ int rtas_call_reentrant(int token, int nargs, int nret, int *outputs, ...)
        return ret;
 }
 
-#else /* CONFIG_PPC_PSERIES */
-int rtas_ibm_suspend_me_unsafe(u64 handle)
-{
-       return -ENOSYS;
-}
-#endif
+#endif /* CONFIG_PPC_PSERIES */
 
 /**
  * Find a specific pseries error log in an RTAS extended event log.