crypto: Clean up header file inclusion and location
- Create a flat directory structure for hw crypto modules
that includes all source and all header files.
- Remove msm/inc directory
- Relocate qcedev.h header file to include/linux
Signed-off-by: Mona Hossain <mhossain@codeaurora.org>
diff --git a/drivers/crypto/msm/ota_crypto.c b/drivers/crypto/msm/ota_crypto.c
index 516253a..b129c05 100644
--- a/drivers/crypto/msm/ota_crypto.c
+++ b/drivers/crypto/msm/ota_crypto.c
@@ -29,8 +29,8 @@
#include <linux/qcota.h>
-#include "inc/qce_ota.h"
-#include "inc/qce.h"
+#include "qce.h"
+#include "qce_ota.h"
enum qce_ota_oper_enum {
QCE_OTA_F8_OPER = 0,
diff --git a/drivers/crypto/msm/qce.c b/drivers/crypto/msm/qce.c
index 077e6c0..d1f564b 100644
--- a/drivers/crypto/msm/qce.c
+++ b/drivers/crypto/msm/qce.c
@@ -26,14 +26,13 @@
#include <linux/crypto.h>
#include <crypto/hash.h>
#include <crypto/sha.h>
-
+#include <linux/qcedev.h>
#include <linux/qcota.h>
#include <mach/dma.h>
-#include "inc/qce.h"
-#include "inc/qcedev.h"
-#include "inc/qcryptohw_30.h"
-#include "inc/qce_ota.h"
+#include "qce.h"
+#include "qcryptohw_30.h"
+#include "qce_ota.h"
/* ADM definitions */
#define LI_SG_CMD (1 << 31) /* last index in the scatter gather cmd */
diff --git a/drivers/crypto/msm/inc/qce.h b/drivers/crypto/msm/qce.h
similarity index 100%
rename from drivers/crypto/msm/inc/qce.h
rename to drivers/crypto/msm/qce.h
diff --git a/drivers/crypto/msm/qce40.c b/drivers/crypto/msm/qce40.c
index 7724d67..4def618 100644
--- a/drivers/crypto/msm/qce40.c
+++ b/drivers/crypto/msm/qce40.c
@@ -24,13 +24,14 @@
#include <linux/spinlock.h>
#include <linux/delay.h>
#include <linux/crypto.h>
+#include <linux/qcedev.h>
#include <crypto/hash.h>
#include <crypto/sha.h>
#include <mach/dma.h>
#include <mach/clk.h>
-#include "inc/qce.h"
-#include "inc/qcedev.h"
-#include "inc/qcryptohw_40.h"
+
+#include "qce.h"
+#include "qcryptohw_40.h"
/* ADM definitions */
#define LI_SG_CMD (1 << 31) /* last index in the scatter gather cmd */
diff --git a/drivers/crypto/msm/inc/qce_ota.h b/drivers/crypto/msm/qce_ota.h
similarity index 97%
rename from drivers/crypto/msm/inc/qce_ota.h
rename to drivers/crypto/msm/qce_ota.h
index f21bd0b..72af585 100644
--- a/drivers/crypto/msm/inc/qce_ota.h
+++ b/drivers/crypto/msm/qce_ota.h
@@ -18,7 +18,6 @@
#include <linux/platform_device.h>
#include <linux/qcota.h>
-#include <inc/qce.h>
int qce_f8_req(void *handle, struct qce_f8_req *req,
diff --git a/drivers/crypto/msm/qcedev.c b/drivers/crypto/msm/qcedev.c
index 464616c..9f3357e 100644
--- a/drivers/crypto/msm/qcedev.c
+++ b/drivers/crypto/msm/qcedev.c
@@ -31,8 +31,8 @@
#include <crypto/hash.h>
#include <linux/platform_data/qcom_crypto_device.h>
#include <mach/scm.h>
-#include "inc/qcedev.h"
-#include "inc/qce.h"
+#include <linux/qcedev.h>
+#include "qce.h"
#define CACHE_LINE_SIZE 32
diff --git a/drivers/crypto/msm/qcrypto.c b/drivers/crypto/msm/qcrypto.c
index c4fd64b..1529929 100644
--- a/drivers/crypto/msm/qcrypto.c
+++ b/drivers/crypto/msm/qcrypto.c
@@ -37,7 +37,7 @@
#include <mach/scm.h>
#include <linux/platform_data/qcom_crypto_device.h>
-#include "inc/qce.h"
+#include "qce.h"
#define MAX_CRYPTO_DEVICE 3
diff --git a/drivers/crypto/msm/inc/qcryptohw_30.h b/drivers/crypto/msm/qcryptohw_30.h
similarity index 100%
rename from drivers/crypto/msm/inc/qcryptohw_30.h
rename to drivers/crypto/msm/qcryptohw_30.h
diff --git a/drivers/crypto/msm/inc/qcryptohw_40.h b/drivers/crypto/msm/qcryptohw_40.h
similarity index 100%
rename from drivers/crypto/msm/inc/qcryptohw_40.h
rename to drivers/crypto/msm/qcryptohw_40.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ac3e990..f95813e 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -422,3 +422,4 @@
header-y += msm_ipc.h
header-y += msm_charm.h
header-y += tzcom.h
+header-y += qcedev.h
diff --git a/drivers/crypto/msm/inc/qcedev.h b/include/linux/qcedev.h
similarity index 90%
rename from drivers/crypto/msm/inc/qcedev.h
rename to include/linux/qcedev.h
index 1d7797f..87040df 100644
--- a/drivers/crypto/msm/inc/qcedev.h
+++ b/include/linux/qcedev.h
@@ -1,16 +1,3 @@
-/* Qualcomm Crypto Engine driver QCEDEV API
- *
- * Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
#ifndef __QCEDEV__H
#define __QCEDEV__H
@@ -41,11 +28,11 @@
* user. Key already set by an external processor.
*/
enum qcedev_oper_enum {
- QCEDEV_OPER_DEC = 0,
- QCEDEV_OPER_ENC = 1,
- QCEDEV_OPER_DEC_NO_KEY = 2,
- QCEDEV_OPER_ENC_NO_KEY = 3,
- QCEDEV_OPER_LAST
+ QCEDEV_OPER_DEC = 0,
+ QCEDEV_OPER_ENC = 1,
+ QCEDEV_OPER_DEC_NO_KEY = 2,
+ QCEDEV_OPER_ENC_NO_KEY = 3,
+ QCEDEV_OPER_LAST
};
/**
@@ -107,7 +94,7 @@
* @len: Size of the buffer
*/
struct buf_info {
- union{
+ union {
uint32_t offset;
uint8_t *vaddr;
};
@@ -135,7 +122,7 @@
* @pmem_src_offset: The offset from input/src buffer
* (allocated by PMEM)
*/
-struct qcedev_pmem_info{
+struct qcedev_pmem_info {
int fd_src;
struct buf_info src[QCEDEV_MAX_BUFFERS];
int fd_dst;
@@ -191,7 +178,7 @@
*/
struct qcedev_cipher_op_req {
uint8_t use_pmem;
- union{
+ union {
struct qcedev_pmem_info pmem;
struct qcedev_vbuf_info vbuf;
};