New subject: [PATCH v2 2/3] uadk: adjust header file include logic

8 Nov 2022

In the current UADK software framework, because each module
owner processes the code separately when editing the code,
the header file inclusion processing during editing is not
perfect, and there are repeatedly included header files,
which need to be deleted.
Signed-off-by: liulongfang liulongfang@huawei.com
---
 drv/hisi_comp.c             | 1 -
 drv/hisi_sec.c              | 4 ----
 include/drv/wd_aead_drv.h   | 3 +--
 include/drv/wd_cipher_drv.h | 4 ++--
 include/drv/wd_comp_drv.h   | 4 ++--
 include/drv/wd_dh_drv.h     | 3 ++-
 include/drv/wd_digest_drv.h | 3 +--
 include/drv/wd_ecc_drv.h    | 2 +-
 include/drv/wd_rsa_drv.h    | 1 +
 include/wd_aead.h           | 1 -
 include/wd_cipher.h         | 1 -
 include/wd_comp.h           | 1 -
 include/wd_dh.h             | 1 -
 include/wd_digest.h         | 1 -
 include/wd_ecc.h            | 1 -
 include/wd_rsa.h            | 1 -
 include/wd_util.h           | 1 -
 wd_aead.c                   | 1 -
 wd_cipher.c                 | 1 -
 wd_comp.c                   | 2 --
 wd_dh.c                     | 2 --
 wd_digest.c                 | 1 -
 wd_ecc.c                    | 1 -
 wd_rsa.c                    | 3 +--
 wd_util.c                   | 1 -
 25 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/drv/hisi_comp.c b/drv/hisi_comp.c
index c940c3f..2eede39 100644
--- a/drv/hisi_comp.c
+++ b/drv/hisi_comp.c
@@ -4,7 +4,6 @@
 #include <asm/types.h>
 #include "drv/wd_comp_drv.h"
 #include "hisi_qm_udrv.h"
-#include "wd.h"
#define	ZLIB				0
 #define	GZIP				1
diff --git a/drv/hisi_sec.c b/drv/hisi_sec.c
index 5b676e9..c30b653 100644
--- a/drv/hisi_sec.c
+++ b/drv/hisi_sec.c
@@ -8,10 +8,6 @@
 #include "../include/drv/wd_digest_drv.h"
 #include "../include/drv/wd_aead_drv.h"
 #include "hisi_qm_udrv.h"
-#include "wd_cipher.h"
-#include "wd_digest.h"
-#include "wd_aead.h"
-#include "wd.h"
#define SEC_DIGEST_ALG_OFFSET	11
 #define WORD_ALIGNMENT_MASK	0x3
diff --git a/include/drv/wd_aead_drv.h b/include/drv/wd_aead_drv.h
index de4a7d7..7c657f6 100644
--- a/include/drv/wd_aead_drv.h
+++ b/include/drv/wd_aead_drv.h
@@ -4,9 +4,8 @@
 #ifndef __WD_AEAD_DRV_H
 #define __WD_AEAD_DRV_H
-#include "../wd_common.h"
-#include "../wd_alg_common.h"
 #include "../wd_aead.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_cipher_drv.h b/include/drv/wd_cipher_drv.h
index f2417a8..82fb89a 100644
--- a/include/drv/wd_cipher_drv.h
+++ b/include/drv/wd_cipher_drv.h
@@ -5,9 +5,9 @@
 #define __WD_CIPHER_DRV_H
#include <asm/types.h>
-#include "../wd_common.h"
-#include "../wd_alg_common.h"
+
 #include "../wd_cipher.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_comp_drv.h b/include/drv/wd_comp_drv.h
index 4c37116..4aeaee4 100644
--- a/include/drv/wd_comp_drv.h
+++ b/include/drv/wd_comp_drv.h
@@ -6,9 +6,9 @@
#include <pthread.h>
 #include <asm/types.h>
-#include "../wd_common.h"
-#include "../wd_alg_common.h"
+
 #include "../wd_comp.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_dh_drv.h b/include/drv/wd_dh_drv.h
index 57f774d..64144e1 100644
--- a/include/drv/wd_dh_drv.h
+++ b/include/drv/wd_dh_drv.h
@@ -5,8 +5,9 @@
 #define __WD_DH_DRV_H
#include <asm/types.h>
-#include "../wd_alg_common.h"
+
 #include "../wd_dh.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_digest_drv.h b/include/drv/wd_digest_drv.h
index 7ba1c30..586588b 100644
--- a/include/drv/wd_digest_drv.h
+++ b/include/drv/wd_digest_drv.h
@@ -3,9 +3,8 @@
 #ifndef __WD_DIGEST_DRV_H
 #define __WD_DIGEST_DRV_H
-#include "../wd_common.h"
-#include "../wd_alg_common.h"
 #include "../wd_digest.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_ecc_drv.h b/include/drv/wd_ecc_drv.h
index ddf5e5b..4d27ccb 100644
--- a/include/drv/wd_ecc_drv.h
+++ b/include/drv/wd_ecc_drv.h
@@ -7,8 +7,8 @@
 #include <stdint.h>
 #include <asm/types.h>
-#include "../wd.h"
 #include "../wd_ecc.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/drv/wd_rsa_drv.h b/include/drv/wd_rsa_drv.h
index 108c2a3..baf112f 100644
--- a/include/drv/wd_rsa_drv.h
+++ b/include/drv/wd_rsa_drv.h
@@ -6,6 +6,7 @@
 #include <asm/types.h>
#include "../wd_rsa.h"
+#include "../wd_util.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/include/wd_aead.h b/include/wd_aead.h
index 3be8e8a..47c496f 100644
--- a/include/wd_aead.h
+++ b/include/wd_aead.h
@@ -9,7 +9,6 @@
#include <dlfcn.h>
 #include "config.h"
-#include "wd.h"
 #include "wd_alg_common.h"
 #include "wd_cipher.h"
 #include "wd_digest.h"
diff --git a/include/wd_cipher.h b/include/wd_cipher.h
index dfd6e60..8e69852 100644
--- a/include/wd_cipher.h
+++ b/include/wd_cipher.h
@@ -8,7 +8,6 @@
 #define __WD_CIPHER_H
#include <dlfcn.h>
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_comp.h b/include/wd_comp.h
index e043a83..0677e51 100644
--- a/include/wd_comp.h
+++ b/include/wd_comp.h
@@ -7,7 +7,6 @@
 #ifndef __WD_COMP_H
 #define __WD_COMP_H
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_dh.h b/include/wd_dh.h
index f342722..1c72228 100644
--- a/include/wd_dh.h
+++ b/include/wd_dh.h
@@ -9,7 +9,6 @@
#include <stdbool.h>
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_digest.h b/include/wd_digest.h
index eb764ce..a44328e 100644
--- a/include/wd_digest.h
+++ b/include/wd_digest.h
@@ -8,7 +8,6 @@
 #define __WD_DIGEST_H
 #include <dlfcn.h>
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_ecc.h b/include/wd_ecc.h
index 05a776d..a92bb4b 100644
--- a/include/wd_ecc.h
+++ b/include/wd_ecc.h
@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <errno.h>
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_rsa.h b/include/wd_rsa.h
index ef7a12c..70e3b05 100644
--- a/include/wd_rsa.h
+++ b/include/wd_rsa.h
@@ -9,7 +9,6 @@
#include <stdbool.h>
-#include "wd.h"
 #include "wd_alg_common.h"
#ifdef __cplusplus
diff --git a/include/wd_util.h b/include/wd_util.h
index 83ac5f8..aea7a23 100644
--- a/include/wd_util.h
+++ b/include/wd_util.h
@@ -11,7 +11,6 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <asm/types.h>
-#include "wd_alg_common.h"
#ifdef __cplusplus
 extern "C" {
diff --git a/wd_aead.c b/wd_aead.c
index b34149e..bac667b 100644
--- a/wd_aead.c
+++ b/wd_aead.c
@@ -6,7 +6,6 @@
#include <stdlib.h>
 #include <pthread.h>
-#include "wd_util.h"
 #include "include/drv/wd_aead_drv.h"
 #include "wd_aead.h"
diff --git a/wd_cipher.c b/wd_cipher.c
index 143f628..ecb7efb 100644
--- a/wd_cipher.c
+++ b/wd_cipher.c
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <pthread.h>
 #include <sched.h>
-#include "wd_util.h"
 #include "include/drv/wd_cipher_drv.h"
 #include "wd_cipher.h"
diff --git a/wd_comp.c b/wd_comp.c
index 0fd87c2..9952c24 100644
--- a/wd_comp.c
+++ b/wd_comp.c
@@ -12,9 +12,7 @@
 #include <string.h>
 #include <time.h>
-#include "config.h"
 #include "drv/wd_comp_drv.h"
-#include "wd_util.h"
 #include "wd_comp.h"
#define WD_POOL_MAX_ENTRIES		1024
diff --git a/wd_dh.c b/wd_dh.c
index 6a839cb..f2f4baa 100644
--- a/wd_dh.c
+++ b/wd_dh.c
@@ -12,10 +12,8 @@
 #include <time.h>
 #include <dlfcn.h>
-#include "config.h"
 #include "include/drv/wd_dh_drv.h"
 #include "wd_util.h"
-#include "wd_dh.h"
#define WD_POOL_MAX_ENTRIES		1024
 #define DH_MAX_KEY_SIZE			512
diff --git a/wd_digest.c b/wd_digest.c
index a30359f..cde586d 100644
--- a/wd_digest.c
+++ b/wd_digest.c
@@ -6,7 +6,6 @@
#include <stdlib.h>
 #include <pthread.h>
-#include "wd_util.h"
 #include "include/drv/wd_digest_drv.h"
 #include "wd_digest.h"
diff --git a/wd_ecc.c b/wd_ecc.c
index f2bf8a5..02b5036 100644
--- a/wd_ecc.c
+++ b/wd_ecc.c
@@ -13,7 +13,6 @@
 #include <time.h>
 #include <dlfcn.h>
-#include "wd_util.h"
 #include "include/drv/wd_ecc_drv.h"
 #include "include/wd_ecc_curve.h"
 #include "wd_ecc.h"
diff --git a/wd_rsa.c b/wd_rsa.c
index 9ddca64..98946bc 100644
--- a/wd_rsa.c
+++ b/wd_rsa.c
@@ -12,9 +12,8 @@
 #include <time.h>
 #include <dlfcn.h>
-#include "config.h"
 #include "include/drv/wd_rsa_drv.h"
-#include "wd_util.h"
+#include "wd_rsa.h"
#define WD_POOL_MAX_ENTRIES		1024
 #define WD_HW_EACCESS			62
diff --git a/wd_util.c b/wd_util.c
index bd82075..57c3a33 100644
--- a/wd_util.c
+++ b/wd_util.c
@@ -10,7 +10,6 @@
 #include <semaphore.h>
 #include <string.h>
 #include <ctype.h>
-#include "wd_alg_common.h"
 #include "wd_sched.h"
 #include "wd_util.h"
-- 
2.33.0

    

[PATCH v2 1/3] uadk: Remove duplicate header files