summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorNeeti Desai <neetid@codeaurora.org>2015-03-17 18:20:35 -0700
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:04:32 -0700
commitaa786020dea1f0d4cf7d33f7d04851ffd649a149 (patch)
treec4ccc7b5bf39666442571474eb7fcd88b91f915b /drivers/soc
parent44c62ba19941f46f20ff81081edd81c96def4fb9 (diff)
msm: move types and declarations to header file
Move all function declarations and types to the header file to make the macros and definitions available even when the CONFIG_MSM_SECURE_BUFFER is not enabled. Rename rid of the msm_ion_secure_table and msm_ion_unsecure_table to something more generic. Change-Id: Ia5ca0c52f971a67c7936c64b42cd2522aa1773fa Signed-off-by: Neeti Desai <neetid@codeaurora.org>
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/qcom/secure_buffer.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/soc/qcom/secure_buffer.c b/drivers/soc/qcom/secure_buffer.c
index 4d188a270005..94b137669368 100644
--- a/drivers/soc/qcom/secure_buffer.c
+++ b/drivers/soc/qcom/secure_buffer.c
@@ -16,12 +16,11 @@
#include <linux/highmem.h>
#include <linux/kernel.h>
#include <linux/kref.h>
-#include <linux/msm_ion.h>
#include <linux/mutex.h>
#include <linux/scatterlist.h>
#include <linux/slab.h>
#include <soc/qcom/scm.h>
-
+#include <soc/qcom/secure_buffer.h>
DEFINE_MUTEX(secure_buffer_mutex);
@@ -48,7 +47,6 @@ struct info_list {
u64 list_size;
};
-
#define MEM_PROT_ASSIGN_ID 0x16
#define MEM_PROTECT_LOCK_ID2 0x0A
#define MEM_PROTECT_LOCK_ID2_FLAT 0x11
@@ -162,7 +160,7 @@ static int secure_buffer_change_table(struct sg_table *table, int lock)
return ret;
}
-int msm_ion_secure_table(struct sg_table *table)
+int msm_secure_table(struct sg_table *table)
{
int ret;
@@ -174,7 +172,7 @@ int msm_ion_secure_table(struct sg_table *table)
}
-int msm_ion_unsecure_table(struct sg_table *table)
+int msm_unsecure_table(struct sg_table *table)
{
int ret;