ARM: qcom: Cleanup scm interface to only export what is needed

Now that scom boot interface is merged we don't need export scm_call
anymore.  Some other minor cleanups related to boot interface to only
export what is needed by scm_set_boot_addr().

Signed-off-by: Kumar Gala <galak@codeaurora.org>

diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c
index e20db10e96f411936eaa71b13638f11f6598fbbc..5147666be096d847358c3116bfd37c3ff1dc36d1 100644 (file)
--- a/arch/arm/mach-qcom/scm.c
+++ b/arch/arm/mach-qcom/scm.c
@@ -249,8 +249,8 @@ static void scm_inv_range(unsigned long start, unsigned long end)
  * response buffers is taken care of by scm_call; however, callers are
  * responsible for any other cached buffers passed over to the secure world.
  */
-int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
-               void *resp_buf, size_t resp_len)
+static int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
+                       void *resp_buf, size_t resp_len)
 {
        int ret;
        struct scm_command *cmd;
@@ -287,7 +287,6 @@ out:
        free_scm_command(cmd);
        return ret;
 }
-EXPORT_SYMBOL(scm_call);
 
 u32 scm_get_version(void)
 {
@@ -325,6 +324,8 @@ u32 scm_get_version(void)
 }
 EXPORT_SYMBOL(scm_get_version);
 
+#define SCM_SVC_BOOT                   0x1
+#define SCM_BOOT_ADDR                  0x1
 /*
  * Set the cold/warm boot address for one of the CPU cores.
  */

diff --git a/arch/arm/mach-qcom/scm.h b/arch/arm/mach-qcom/scm.h
index cfe693575d5177c13dcac91d96bd529c328f380d..d73c3786c8819c97766da314f819bc7741e4411d 100644 (file)
--- a/arch/arm/mach-qcom/scm.h
+++ b/arch/arm/mach-qcom/scm.h
@@ -12,13 +12,6 @@
 #ifndef __MACH_SCM_H
 #define __MACH_SCM_H
 
-#define SCM_SVC_BOOT                   0x1
-#define SCM_SVC_PIL                    0x2
-
-extern int scm_call(u32 svc_id, u32 cmd_id, const void *cmd_buf, size_t cmd_len,
-               void *resp_buf, size_t resp_len);
-
-#define SCM_BOOT_ADDR                  0x1
 #define SCM_FLAG_COLDBOOT_CPU1         0x01
 #define SCM_FLAG_COLDBOOT_CPU2         0x08
 #define SCM_FLAG_COLDBOOT_CPU3         0x20