From 9b4129c9499017c580e441d15a94e4ceb95fa54e Mon Sep 17 00:00:00 2001
From: YOUR_NAME <huangjieliang@huawei.com>
Date: Wed, 19 May 2021 11:20:09 +0800
Subject: [PATCH] Remove redundant macro definition(OFFSET_OF_FIELD)

Close #I3QMN1

Change-Id: I0ddd0c4474f5f6b5a2b1dd6608d642167b5548e6
---
 apps/shell/include/shell_list.h   | 25 ++-----------------------
 kernel/base/ipc/los_queue_debug.c |  2 +-
 kernel/base/ipc/los_sem_debug.c   |  2 +-
 kernel/include/los_list.h         | 25 ++-----------------------
 4 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/apps/shell/include/shell_list.h b/apps/shell/include/shell_list.h
index 020c1711..25030234 100644
--- a/apps/shell/include/shell_list.h
+++ b/apps/shell/include/shell_list.h
@@ -350,31 +350,10 @@ static inline void SH_ListHeadInsertList(SH_List *oldList, SH_List *newList)
  * <li>None.</li>
  * </ul>
  *
- * @param type   [IN] Structure name.
- * @param field  [IN] Name of the field of which the offset is to be measured.
- *
- * @retval Offset of the field to the structure address.
- * @par Dependency:
- * <ul><li>shell_list.h: the header file that contains the API declaration.</li></ul>
- * @see
- */
-#define OFFSET_OF_FIELD(type, field) ((uintptr_t)&((type *)0)->field)
-
-/**
- * @ingroup shell_list
- * @brief Obtain the pointer to a doubly linked list in a structure.
- *
- * @par Description:
- * This API is used to obtain the pointer to a doubly linked list in a structure.
- * @attention
- * <ul>
- * <li>None.</li>
- * </ul>
- *
  * @param type    [IN] Structure name.
- * @param member  [IN] Member name of the doubly linked list in the structure.
+ * @param member  [IN] Name of the member of which the offset is to be measured.
  *
- * @retval Pointer to the doubly linked list in the structure.
+ * @retval Offset of the field to the structure address.
  * @par Dependency:
  * <ul><li>shell_list.h: the header file that contains the API declaration.</li></ul>
  * @see
diff --git a/kernel/base/ipc/los_queue_debug.c b/kernel/base/ipc/los_queue_debug.c
index 203521f9..d1d6f658 100644
--- a/kernel/base/ipc/los_queue_debug.c
+++ b/kernel/base/ipc/los_queue_debug.c
@@ -104,7 +104,7 @@ STATIC VOID SortQueueIndexArray(UINT32 *indexArray, UINT32 count)
     queueSortParam.buf = (CHAR *)g_queueDebugArray;
     queueSortParam.ipcDebugCBSize = sizeof(QueueDebugCB);
     queueSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_SEM_LIMIT;
-    queueSortParam.sortElemOff = OFFSET_OF_FIELD(QueueDebugCB, lastAccessTime);
+    queueSortParam.sortElemOff = LOS_OFF_SET_OF(QueueDebugCB, lastAccessTime);
 
     if (count > 0) {
         SCHEDULER_LOCK(intSave);
diff --git a/kernel/base/ipc/los_sem_debug.c b/kernel/base/ipc/los_sem_debug.c
index f6ef2728..5321a765 100644
--- a/kernel/base/ipc/los_sem_debug.c
+++ b/kernel/base/ipc/los_sem_debug.c
@@ -129,7 +129,7 @@ STATIC VOID OsSemSort(UINT32 *semIndexArray, UINT32 usedCount)
     semSortParam.buf = (CHAR *)g_semDebugArray;
     semSortParam.ipcDebugCBSize = sizeof(SemDebugCB);
     semSortParam.ipcDebugCBCnt = LOSCFG_BASE_IPC_SEM_LIMIT;
-    semSortParam.sortElemOff = OFFSET_OF_FIELD(SemDebugCB, lastAccessTime);
+    semSortParam.sortElemOff = LOS_OFF_SET_OF(SemDebugCB, lastAccessTime);
 
     /* It will Print out ALL the Used Semaphore List. */
     PRINTK("Used Semaphore List: \n");
diff --git a/kernel/include/los_list.h b/kernel/include/los_list.h
index 7b7bd88c..6974a2db 100644
--- a/kernel/include/los_list.h
+++ b/kernel/include/los_list.h
@@ -384,31 +384,10 @@ LITE_OS_SEC_ALW_INLINE STATIC INLINE VOID LOS_ListHeadInsertList(LOS_DL_LIST *ol
  * <li>None.</li>
  * </ul>
  *
- * @param type   [IN] Structure name.
- * @param field  [IN] Name of the field of which the offset is to be measured.
- *
- * @retval Offset of the field to the structure address.
- * @par Dependency:
- * <ul><li>los_list.h: the header file that contains the API declaration.</li></ul>
- * @see
- */
-#define OFFSET_OF_FIELD(type, field) ((UINTPTR)&((type *)0)->field)
-
-/**
- * @ingroup los_list
- * @brief Obtain the pointer to a doubly linked list in a structure.
- *
- * @par Description:
- * This API is used to obtain the pointer to a doubly linked list in a structure.
- * @attention
- * <ul>
- * <li>None.</li>
- * </ul>
- *
  * @param type    [IN] Structure name.
- * @param member  [IN] Member name of the doubly linked list in the structure.
+ * @param member  [IN] Name of the member of which the offset is to be measured.
  *
- * @retval Pointer to the doubly linked list in the structure.
+ * @retval Offset of the field to the structure address.
  * @par Dependency:
  * <ul><li>los_list.h: the header file that contains the API declaration.</li></ul>
  * @see
-- 
GitLab