From f56eeed30dba055765b05470883361745f7159e0 Mon Sep 17 00:00:00 2001
From: yinshuqing <yinshuqing@huawei.com>
Date: Thu, 11 Nov 2021 16:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6=E6=B8=85?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yinshuqing <yinshuqing@huawei.com>
---
 model/storage/src/mmc/emmc_if.c               | 3 ---
 model/storage/src/mmc/mmc_core.c              | 4 ----
 model/storage/src/mmc/mmc_dispatch.c          | 3 ---
 model/storage/src/mmc/mmc_emmc.c              | 1 -
 model/storage/src/mmc/mmc_if.c                | 3 +--
 model/storage/src/mmc/sdio_if.c               | 3 ---
 support/platform/include/adc/adc_core.h       | 1 -
 support/platform/include/i2s/i2s_core.h       | 1 -
 support/platform/include/mipi/mipi_csi_core.h | 3 ---
 support/platform/include/rtc/rtc_core.h       | 1 -
 support/platform/src/adc/adc_if.c             | 2 --
 support/platform/src/fwk/platform_common.c    | 2 --
 support/platform/src/fwk/platform_manager.c   | 3 ---
 support/platform/src/fwk/platform_queue.c     | 2 --
 support/platform/src/gpio/gpio_core.c         | 3 ---
 support/platform/src/gpio/gpio_if.c           | 2 --
 support/platform/src/hdmi/hdmi_dispatch.c     | 2 --
 support/platform/src/i2c/i2c_if.c             | 3 +--
 support/platform/src/i2s/i2s_if.c             | 3 ---
 support/platform/src/mipi/mipi_dsi_core.c     | 1 -
 support/platform/src/rtc/rtc_if.c             | 4 ----
 support/platform/src/watchdog/watchdog_core.c | 1 -
 test/unittest/platform/virtual/i3c_virtual.c  | 3 ---
 23 files changed, 2 insertions(+), 52 deletions(-)

diff --git a/model/storage/src/mmc/emmc_if.c b/model/storage/src/mmc/emmc_if.c
index 02bfe8c1c..1258278c7 100644
--- a/model/storage/src/mmc/emmc_if.c
+++ b/model/storage/src/mmc/emmc_if.c
@@ -7,16 +7,13 @@
  */
 
 #ifndef __USER__
-#include "devsvc_manager_clnt.h"
 #include "mmc_emmc.h"
 #endif
 #include "emmc_if.h"
-#include "hdf_base.h"
 #ifdef __USER__
 #include "hdf_io_service_if.h"
 #endif
 #include "hdf_log.h"
-#include "osal_mem.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG emmc_if_c
diff --git a/model/storage/src/mmc/mmc_core.c b/model/storage/src/mmc/mmc_core.c
index 68493eb6c..4fd6bb8e9 100644
--- a/model/storage/src/mmc/mmc_core.c
+++ b/model/storage/src/mmc/mmc_core.c
@@ -7,15 +7,11 @@
   */
 
 #include "device_resource_if.h"
-#include "hdf_dlist.h"
 #include "hdf_log.h"
 #include "mmc_block.h"
-#include "mmc_corex.h"
 #include "mmc_dispatch.h"
 #include "mmc_emmc.h"
 #include "mmc_sdio.h"
-#include "osal_mem.h"
-#include "osal_time.h"
 
 #define HDF_LOG_TAG mmc_core_c
 
diff --git a/model/storage/src/mmc/mmc_dispatch.c b/model/storage/src/mmc/mmc_dispatch.c
index 2013b8ab3..a9064574f 100644
--- a/model/storage/src/mmc/mmc_dispatch.c
+++ b/model/storage/src/mmc/mmc_dispatch.c
@@ -6,11 +6,8 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "mmc_dispatch.h"
 #include "hdf_log.h"
-#include "mmc_corex.h"
 #include "mmc_emmc.h"
-#include "mmc_sdio.h"
 
 static int32_t MmcCmdDevPresent(struct MmcCntlr *cntlr, struct HdfSBuf *data, struct HdfSBuf *reply)
 {
diff --git a/model/storage/src/mmc/mmc_emmc.c b/model/storage/src/mmc/mmc_emmc.c
index e4495e3c2..6dbc13fd1 100644
--- a/model/storage/src/mmc/mmc_emmc.c
+++ b/model/storage/src/mmc/mmc_emmc.c
@@ -7,7 +7,6 @@
  */
 
 #include "mmc_emmc.h"
-#include "securec.h"
 
 #define HDF_LOG_TAG mmc_emmc_c
 
diff --git a/model/storage/src/mmc/mmc_if.c b/model/storage/src/mmc/mmc_if.c
index dba2d503a..df5d58882 100644
--- a/model/storage/src/mmc/mmc_if.c
+++ b/model/storage/src/mmc/mmc_if.c
@@ -8,10 +8,9 @@
 
 #include "mmc_if.h"
 #ifndef __USER__
-#include "devsvc_manager_clnt.h"
 #include "mmc_corex.h"
 #endif
-#include "hdf_base.h"
+
 #ifdef __USER__
 #include "hdf_io_service_if.h"
 #endif
diff --git a/model/storage/src/mmc/sdio_if.c b/model/storage/src/mmc/sdio_if.c
index cd05ef458..05cde6131 100644
--- a/model/storage/src/mmc/sdio_if.c
+++ b/model/storage/src/mmc/sdio_if.c
@@ -7,11 +7,8 @@
  */
 
 #include "sdio_if.h"
-#include "hdf_base.h"
 #include "hdf_log.h"
 #include "mmc_sdio.h"
-#include "osal_mem.h"
-#include "securec.h"
 
 #define HDF_LOG_TAG sdio_if_c
 
diff --git a/support/platform/include/adc/adc_core.h b/support/platform/include/adc/adc_core.h
index e0e47b521..a45a87663 100644
--- a/support/platform/include/adc/adc_core.h
+++ b/support/platform/include/adc/adc_core.h
@@ -11,7 +11,6 @@
 
 #include "osal_spinlock.h"
 #include "hdf_base.h"
-#include "adc_if.h"
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/support/platform/include/i2s/i2s_core.h b/support/platform/include/i2s/i2s_core.h
index f43de1df1..2e07a9438 100644
--- a/support/platform/include/i2s/i2s_core.h
+++ b/support/platform/include/i2s/i2s_core.h
@@ -9,7 +9,6 @@
 #ifndef I2S_CORE_H
 #define I2S_CORE_H
 
-#include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "hdf_dlist.h"
 #include "i2s_if.h"
diff --git a/support/platform/include/mipi/mipi_csi_core.h b/support/platform/include/mipi/mipi_csi_core.h
index 54fdba139..2e8c53f0a 100755
--- a/support/platform/include/mipi/mipi_csi_core.h
+++ b/support/platform/include/mipi/mipi_csi_core.h
@@ -9,10 +9,7 @@
 #ifndef MIPI_CSI_CORE_H
 #define MIPI_CSI_CORE_H
 
-#include "hdf_base.h"
-#include "hdf_device.h"
 #include "hdf_device_desc.h"
-#include "hdf_object.h"
 #include "mipi_csi_if.h"
 #include "osal_mutex.h"
 #include "osal_spinlock.h"
diff --git a/support/platform/include/rtc/rtc_core.h b/support/platform/include/rtc/rtc_core.h
index 6ca9d7c9a..22eb23a10 100644
--- a/support/platform/include/rtc/rtc_core.h
+++ b/support/platform/include/rtc/rtc_core.h
@@ -9,7 +9,6 @@
 #ifndef RTC_CORE_H
 #define RTC_CORE_H
 
-#include "hdf_base.h"
 #include "hdf_device_desc.h"
 #include "osal_mutex.h"
 #include "rtc_if.h"
diff --git a/support/platform/src/adc/adc_if.c b/support/platform/src/adc/adc_if.c
index 23c5fcc8b..d022cc8cf 100644
--- a/support/platform/src/adc/adc_if.c
+++ b/support/platform/src/adc/adc_if.c
@@ -9,8 +9,6 @@
 #include "adc_if.h"
 #include "adc_core.h"
 #include "hdf_log.h"
-#include "osal_mem.h"
-#include "securec.h"
 #define HDF_LOG_TAG adc_if_c
 #define ADC_SERVICE_NAME "HDF_PLATFORM_ADC_MANAGER"
 
diff --git a/support/platform/src/fwk/platform_common.c b/support/platform/src/fwk/platform_common.c
index 774a84bc9..7498fd676 100644
--- a/support/platform/src/fwk/platform_common.c
+++ b/support/platform/src/fwk/platform_common.c
@@ -6,8 +6,6 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdf_log.h"
-#include "osal_spinlock.h"
 #include "platform_core.h"
 
 static struct PlatformModuleInfo g_platformModules[] = {
diff --git a/support/platform/src/fwk/platform_manager.c b/support/platform/src/fwk/platform_manager.c
index 4b1ff4803..cbc478118 100644
--- a/support/platform/src/fwk/platform_manager.c
+++ b/support/platform/src/fwk/platform_manager.c
@@ -8,10 +8,7 @@
 
 #include "hdf_log.h"
 #include "osal_mem.h"
-#include "osal_sem.h"
 #include "platform_core.h"
-#include "platform_device.h"
-#include "platform_manager.h"
 
 #define PLATFORM_MANAGER_NAME_DEFAULT "PlatformManagerDefault"
 
diff --git a/support/platform/src/fwk/platform_queue.c b/support/platform/src/fwk/platform_queue.c
index 3a83ee017..b5d7c46d4 100644
--- a/support/platform/src/fwk/platform_queue.c
+++ b/support/platform/src/fwk/platform_queue.c
@@ -9,8 +9,6 @@
 #include "platform_queue.h"
 #include "hdf_log.h"
 #include "osal_mem.h"
-#include "osal_mutex.h"
-#include "osal_thread.h"
 
 #define MMC_QUEUE_THREAD_STAK 20000
 
diff --git a/support/platform/src/gpio/gpio_core.c b/support/platform/src/gpio/gpio_core.c
index 39b763614..2de5acf04 100644
--- a/support/platform/src/gpio/gpio_core.c
+++ b/support/platform/src/gpio/gpio_core.c
@@ -7,11 +7,8 @@
  */
 
 #include "gpio/gpio_core.h"
-#include "hdf_log.h"
 #include "osal_mem.h"
 #include "plat_log.h"
-#include "platform_core.h"
-#include "securec.h"
 
 #define HDF_LOG_TAG gpio_core
 
diff --git a/support/platform/src/gpio/gpio_if.c b/support/platform/src/gpio/gpio_if.c
index d7c0205cd..d466a2299 100644
--- a/support/platform/src/gpio/gpio_if.c
+++ b/support/platform/src/gpio/gpio_if.c
@@ -13,11 +13,9 @@
 #include "hdf_io_service_if.h"
 #include "platform_errno.h"
 #else
-#include "devsvc_manager_clnt.h"
 #include "gpio/gpio_core.h"
 #endif
 
-#include "hdf_base.h"
 #include "hdf_log.h"
 
 #define HDF_LOG_TAG gpio_if
diff --git a/support/platform/src/hdmi/hdmi_dispatch.c b/support/platform/src/hdmi/hdmi_dispatch.c
index 0e4ad04a7..f3509e812 100644
--- a/support/platform/src/hdmi/hdmi_dispatch.c
+++ b/support/platform/src/hdmi/hdmi_dispatch.c
@@ -6,10 +6,8 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "hdmi_dispatch.h"
 #include "hdf_log.h"
 #include "hdmi_core.h"
-#include "hdmi_if.h"
 
 #define HDF_LOG_TAG hdmi_dispatch_c
 
diff --git a/support/platform/src/i2c/i2c_if.c b/support/platform/src/i2c/i2c_if.c
index 596650743..4d8770eb2 100644
--- a/support/platform/src/i2c/i2c_if.c
+++ b/support/platform/src/i2c/i2c_if.c
@@ -10,7 +10,7 @@
 #ifndef __USER__
 #include "devsvc_manager_clnt.h"
 #endif
-#include "hdf_base.h"
+
 #ifdef __USER__
 #include "hdf_io_service_if.h"
 #endif
@@ -18,7 +18,6 @@
 #ifndef __USER__
 #include "i2c_core.h"
 #endif
-#include "osal_mem.h"
 #include "securec.h"
 
 #define HDF_LOG_TAG i2c_if
diff --git a/support/platform/src/i2s/i2s_if.c b/support/platform/src/i2s/i2s_if.c
index d2fb248f7..8df908bb4 100644
--- a/support/platform/src/i2s/i2s_if.c
+++ b/support/platform/src/i2s/i2s_if.c
@@ -6,9 +6,6 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "i2s_if.h"
-#include "los_vm_zone.h"
-#include "devsvc_manager_clnt.h"
 #include "hdf_log.h"
 #include "osal_mem.h"
 #include "osal_time.h"
diff --git a/support/platform/src/mipi/mipi_dsi_core.c b/support/platform/src/mipi/mipi_dsi_core.c
index c11d85579..a7126785f 100644
--- a/support/platform/src/mipi/mipi_dsi_core.c
+++ b/support/platform/src/mipi/mipi_dsi_core.c
@@ -8,7 +8,6 @@
 
 #include "mipi_dsi_core.h"
 #include "hdf_log.h"
-#include "osal_mem.h"
 #include "osal_time.h"
 
 #define HDF_LOG_TAG mipi_dsi_core
diff --git a/support/platform/src/rtc/rtc_if.c b/support/platform/src/rtc/rtc_if.c
index 140f3c3f9..e77964ef4 100644
--- a/support/platform/src/rtc/rtc_if.c
+++ b/support/platform/src/rtc/rtc_if.c
@@ -6,11 +6,7 @@
  * See the LICENSE file in the root of this repository for complete details.
  */
 
-#include "rtc_if.h"
-#include "devsvc_manager_clnt.h"
-#include "hdf_base.h"
 #include "hdf_log.h"
-#include "osal_mem.h"
 #include "rtc_base.h"
 #include "rtc_core.h"
 
diff --git a/support/platform/src/watchdog/watchdog_core.c b/support/platform/src/watchdog/watchdog_core.c
index ba522098b..a35035a78 100644
--- a/support/platform/src/watchdog/watchdog_core.c
+++ b/support/platform/src/watchdog/watchdog_core.c
@@ -8,7 +8,6 @@
 
 #include "watchdog_core.h"
 #include "hdf_log.h"
-#include "osal_mem.h"
 
 #define HDF_LOG_TAG watchdog_core
 
diff --git a/test/unittest/platform/virtual/i3c_virtual.c b/test/unittest/platform/virtual/i3c_virtual.c
index 8811810cd..401bc0176 100644
--- a/test/unittest/platform/virtual/i3c_virtual.c
+++ b/test/unittest/platform/virtual/i3c_virtual.c
@@ -9,11 +9,8 @@
 #include "i3c/i3c_core.h"
 #include "device_resource_if.h"
 #include "hdf_device_desc.h"
-#include "hdf_log.h"
 #include "osal_io.h"
-#include "osal_irq.h"
 #include "osal_mem.h"
-#include "osal_spinlock.h"
 #include "osal_time.h"
 #include "plat_log.h"
 
-- 
Gitee