Reorganize files to meet compilation mechanism on enabled GKI products.

On enable GKI products, there will use Qcom latest dlkm compile file 
(device/qcom/common/dlkm/AndroidKernelModule.mk) to build kernel driver module, 
and it requires all files of the current target driver module to be in the same 
hierarchy path. Otherwise, when compile this module, a file will can not find 
other local header files that under the different hierarchy path.

Change-Id: I09cfc7bd4539fb3ba8d654b240493d8a11066bee
Signed-off-by: linyx10 <linyx10@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1884805
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Binsheng Que <quebs2@motorola.com>
Reviewed-by: Zhenxin Xi <xizx@motorola.com>
Submit-Approved: Jira Key

drivers/gud/MobiCoreDriver/admin.c

@@ -32,8 +32,8 @@
 #endif
 #include <linux/freezer.h>
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
+#include "mc_user.h"
+#include "mc_admin.h"
 
 #include "main.h"
 #include "mmu.h"	/* For load_check and load_token */

drivers/gud/MobiCoreDriver/client.c

@@ -26,8 +26,8 @@
 #include <net/sock.h>		/* sockfd_lookup */
 #include <linux/file.h>		/* fput */
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
+#include "mc_user.h"
+#include "mc_admin.h"
 
 #include "main.h"
 #include "mmu.h"

drivers/gud/MobiCoreDriver/client.h

@@ -19,7 +19,7 @@
 #include <linux/list.h>
 #include <linux/sched.h>	/* TASK_COMM_LEN */
 
-#include "public/mc_user.h"	/* many types */
+#include "mc_user.h"	/* many types */
 
 struct tee_client;
 struct mcp_open_info;

drivers/gud/MobiCoreDriver/clientlib.c

@@ -20,9 +20,9 @@
 #include <linux/sched.h>
 #include <linux/list.h>
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
-#include "public/mobicore_driver_api.h"
+#include "mc_user.h"
+#include "mc_admin.h"
+#include "mobicore_driver_api.h"
 
 #include "main.h"
 #include "client.h"

drivers/gud/MobiCoreDriver/fastcall.c

@@ -21,7 +21,7 @@
 #include <linux/sched/clock.h>	/* local_clock */
 #endif
 
-#include "mci/mcifc.h"
+#include "mcifc.h"
 
 #include "platform.h"	/* MC_SMC_FASTCALL */
 #include "main.h"

drivers/gud/MobiCoreDriver/iwp.c

@@ -33,15 +33,15 @@
 #include <linux/sched/clock.h>	/* local_clock */
 #endif
 
-#include "public/GP/tee_client_api.h"	/* GP error codes/origins FIXME move */
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
+#include "tee_client_api.h"	/* GP error codes/origins FIXME move */
+#include "mc_user.h"
+#include "mc_admin.h"
 
-#include "mci/mcimcp.h"
-#include "mci/mcifc.h"
-#include "mci/mcinq.h"		/* SID_MCP */
-#include "mci/mcitime.h"	/* struct mcp_time */
-#include "mci/mciiwp.h"
+#include "mcimcp.h"
+#include "mcifc.h"
+#include "mcinq.h"		/* SID_MCP */
+#include "mcitime.h"	/* struct mcp_time */
+#include "mciiwp.h"
 
 #include "main.h"
 #include "admin.h"              /* tee_object* for 'blob' */

drivers/gud/MobiCoreDriver/iwp.h

@@ -16,7 +16,7 @@
 #ifndef _MC_IWP_H_
 #define _MC_IWP_H_
 
-#include "mci/mcloadformat.h"		/* struct identity */
+#include "mcloadformat.h"		/* struct identity */
 
 #include "nq.h"
 #include "mcp.h" /* mcp_buffer_map FIXME move to nq? */

drivers/gud/MobiCoreDriver/main.c

@@ -23,8 +23,8 @@
 #include <linux/suspend.h>
 #include <linux/cpu.h>
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"		/* MC_ADMIN_DEVNODE */
+#include "mc_user.h"
+#include "mc_admin.h"		/* MC_ADMIN_DEVNODE */
 
 #include "platform.h"			/* MC_PM_RUNTIME */
 #include "main.h"

drivers/gud/MobiCoreDriver/mciiwp.h

@@ -16,7 +16,7 @@
 #ifndef MCIIWP_H_
 #define MCIIWP_H_
 
-#include "public/GP/tee_client_types.h" /* teec_uuid FIXME it's all mixed up! */
+#include "tee_client_types.h" /* teec_uuid FIXME it's all mixed up! */
 
 /** Session ID for notifications for the Dragon CA-to-TA communication protocol
  *

drivers/gud/MobiCoreDriver/mcimcp.h

@@ -16,7 +16,7 @@
 #ifndef MCP_H_
 #define MCP_H_
 
-#include "mci/mcloadformat.h"
+#include "mcloadformat.h"
 
 /** Indicates a response */
 #define FLAG_RESPONSE		BIT(31)

drivers/gud/MobiCoreDriver/mcp.c

@@ -33,14 +33,14 @@
 #include <linux/sched/clock.h>	/* local_clock */
 #endif
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
+#include "mc_user.h"
+#include "mc_admin.h"
 
-#include "mci/mcimcp.h"
-#include "mci/mcifc.h"
-#include "mci/mcinq.h"		/* SID_MCP */
-#include "mci/mcitime.h"	/* struct mcp_time */
-#include "mci/mciiwp.h"
+#include "mcimcp.h"
+#include "mcifc.h"
+#include "mcinq.h"		/* SID_MCP */
+#include "mcitime.h"	/* struct mcp_time */
+#include "mciiwp.h"
 
 #include "main.h"
 #include "admin.h"		/* tee_object* for 'blob' */

drivers/gud/MobiCoreDriver/mcp.h

@@ -16,7 +16,7 @@
 #ifndef _MC_MCP_H_
 #define _MC_MCP_H_
 
-#include "mci/mcloadformat.h"		/* struct identity */
+#include "mcloadformat.h"		/* struct identity */
 #include "nq.h"
 
 struct tee_mmu;

drivers/gud/MobiCoreDriver/mmu.c

@@ -40,9 +40,9 @@
 #include <xen/page.h>
 #endif
 
-#include "public/mc_user.h"
+#include "mc_user.h"
 
-#include "mci/mcimcp.h"
+#include "mcimcp.h"
 
 #include "main.h"
 #include "mcp.h"	/* mcp_buffer_map */

drivers/gud/MobiCoreDriver/nq.c

@@ -29,14 +29,14 @@
 
 #include "platform.h"			/* CPU-related information */
 
-#include "public/mc_user.h"
-#include "public/mc_linux_api.h"
+#include "mc_user.h"
+#include "mc_linux_api.h"
 
-#include "mci/mcifc.h"
-#include "mci/mciiwp.h"
-#include "mci/mcimcp.h"
-#include "mci/mcinq.h"
-#include "mci/mcitime.h"		/* struct mcp_time */
+#include "mcifc.h"
+#include "mciiwp.h"
+#include "mcimcp.h"
+#include "mcinq.h"
+#include "mcitime.h"		/* struct mcp_time */
 
 #include "main.h"
 #include "clock.h"

drivers/gud/MobiCoreDriver/session.c

@@ -33,8 +33,8 @@
 #include <linux/sched/task.h>	/* put_task_struct */
 #endif
 
-#include "public/mc_user.h"
-#include "public/mc_admin.h"
+#include "mc_user.h"
+#include "mc_admin.h"
 
 #if KERNEL_VERSION(3, 5, 0) <= LINUX_VERSION_CODE
 #include <linux/uidgid.h>
@@ -74,7 +74,7 @@ static inline bool gid_lt(kgid_t left, kgid_t right)
 #include "mcp.h"
 #include "client.h"		/* *cbuf* */
 #include "session.h"
-#include "mci/mcimcp.h"		/* WSM_INVALID */
+#include "mcimcp.h"		/* WSM_INVALID */
 
 #define SHA1_HASH_SIZE       20
 

drivers/gud/MobiCoreDriver/teeclientapi.c

@@ -18,11 +18,11 @@
 #include <linux/vmalloc.h>
 #include <linux/export.h>
 
-#include "public/GP/tee_client_api.h"
-#include "public/mc_user.h"
+#include "tee_client_api.h"
+#include "mc_user.h"
 
 #include "main.h"
-#include "mci/mcinq.h"	/* TA termination codes */
+#include "mcinq.h"	/* TA termination codes */
 #include "client.h"
 
 /* Macros */

drivers/gud/MobiCoreDriver/user.c

@@ -20,7 +20,7 @@
 #include <linux/mm_types.h>	/* struct vm_area_struct */
 #include <linux/uaccess.h>
 
-#include "public/mc_user.h"
+#include "mc_user.h"
 
 #include "main.h"
 #include "user.h"

drivers/gud/MobiCoreDriver/xen_common.h

@@ -23,9 +23,9 @@
 #include <xen/xen.h>
 #include <xen/xenbus.h>
 
-#include "public/mc_user.h"	/* many types */
-#include "mci/mciiwp.h"
-#include "mci/mcimcp.h"
+#include "mc_user.h"	/* many types */
+#include "mciiwp.h"
+#include "mcimcp.h"
 #include "mmu.h"		/* PMD/PTE max entries */
 #include "client.h"		/* For BE to treat other VMs as clients */
 

drivers/gud/MobiCoreDriver/xen_fe.c

@@ -15,7 +15,7 @@
 
 #include <linux/irq.h>
 
-#include "mci/mciiwp.h"		/* struct interworld_session */
+#include "mciiwp.h"		/* struct interworld_session */
 
 #include "main.h"