From 16e87d78d89bec7d85c076fc738ed4ad0614b865 Mon Sep 17 00:00:00 2001
From: yinjiaming <yinjiaming@huawei.com>
Date: Fri, 18 Feb 2022 10:54:00 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DirqNum=20=3D=20HwiNumG?=
 =?UTF-8?q?et()=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E3=80=90=E8=83=8C=E6=99=AF=E3=80=91=20L0=EF=BC=8CM?=
 =?UTF-8?q?33=E5=86=85=E6=A0=B8=EF=BC=8C=E7=BC=96=E8=AF=91=E6=97=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF,=20irqNum=20=3D=20HwiNumGe?=
 =?UTF-8?q?t()=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【修改方案】
删去引起编译错误的变量,直接用函数的返回值代替

【影响】
对现有的产品编译不会有影响。

re #I4S81B
Signed-off-by: yinjiaming <yinjiaming@huawei.com>
Change-Id: I7dba42cb158cbb969053a83ddd22d76ee30646d1
---
 arch/arm/arm9/gcc/los_interrupt.c                     | 3 +--
 arch/arm/cortex-m3/keil/los_interrupt.c               | 3 +--
 arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c           | 3 +--
 arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c | 3 +--
 arch/arm/cortex-m33/iar/NTZ/los_interrupt.c           | 3 +--
 arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c | 3 +--
 arch/arm/cortex-m4/gcc/los_interrupt.c                | 3 +--
 arch/arm/cortex-m4/iar/los_interrupt.c                | 3 +--
 arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c           | 3 +--
 arch/arm/cortex-m7/gcc/los_interrupt.c                | 3 +--
 arch/arm/cortex-m7/iar/los_interrupt.c                | 3 +--
 arch/csky/v2/gcc/los_interrupt.c                      | 3 +--
 arch/xtensa/lx6/gcc/los_interrupt.c                   | 3 +--
 13 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/arch/arm/arm9/gcc/los_interrupt.c b/arch/arm/arm9/gcc/los_interrupt.c
index aeba62f9..fe5b6a43 100644
--- a/arch/arm/arm9/gcc/los_interrupt.c
+++ b/arch/arm/arm9/gcc/los_interrupt.c
@@ -166,8 +166,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m3/keil/los_interrupt.c b/arch/arm/cortex-m3/keil/los_interrupt.c
index 8a40b1d8..9fd8ce4d 100644
--- a/arch/arm/cortex-m3/keil/los_interrupt.c
+++ b/arch/arm/cortex-m3/keil/los_interrupt.c
@@ -201,8 +201,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c b/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
index e4288895..61429aff 100755
--- a/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
+++ b/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
@@ -192,8 +192,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
index f4b84c84..7e086f56 100755
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
@@ -192,8 +192,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c b/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
index 1e59f920..a5420961 100644
--- a/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
+++ b/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
@@ -198,8 +198,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c b/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
index 1e59f920..a5420961 100644
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
+++ b/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
@@ -198,8 +198,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m4/gcc/los_interrupt.c b/arch/arm/cortex-m4/gcc/los_interrupt.c
index cf225389..ee33f016 100644
--- a/arch/arm/cortex-m4/gcc/los_interrupt.c
+++ b/arch/arm/cortex-m4/gcc/los_interrupt.c
@@ -196,8 +196,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m4/iar/los_interrupt.c b/arch/arm/cortex-m4/iar/los_interrupt.c
index 6c542400..a00d1ad1 100644
--- a/arch/arm/cortex-m4/iar/los_interrupt.c
+++ b/arch/arm/cortex-m4/iar/los_interrupt.c
@@ -202,8 +202,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c b/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c
index 820d435a..c55bf380 100755
--- a/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c
@@ -196,8 +196,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m7/gcc/los_interrupt.c b/arch/arm/cortex-m7/gcc/los_interrupt.c
index ca7b9960..9a09512e 100644
--- a/arch/arm/cortex-m7/gcc/los_interrupt.c
+++ b/arch/arm/cortex-m7/gcc/los_interrupt.c
@@ -191,8 +191,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/arm/cortex-m7/iar/los_interrupt.c b/arch/arm/cortex-m7/iar/los_interrupt.c
index f2d754a6..dbb0cfd9 100644
--- a/arch/arm/cortex-m7/iar/los_interrupt.c
+++ b/arch/arm/cortex-m7/iar/los_interrupt.c
@@ -198,8 +198,7 @@ inline UINT32 ArchIsIntActive(VOID)
 /*lint -e529*/
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/csky/v2/gcc/los_interrupt.c b/arch/csky/v2/gcc/los_interrupt.c
index c62273a9..b18dbfed 100644
--- a/arch/csky/v2/gcc/los_interrupt.c
+++ b/arch/csky/v2/gcc/los_interrupt.c
@@ -282,8 +282,7 @@ inline UINT32 ArchIsIntActive(VOID)
  **************************************************************************** */
 LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%x\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%x\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }
 
diff --git a/arch/xtensa/lx6/gcc/los_interrupt.c b/arch/xtensa/lx6/gcc/los_interrupt.c
index 38a3d580..a593047d 100644
--- a/arch/xtensa/lx6/gcc/los_interrupt.c
+++ b/arch/xtensa/lx6/gcc/los_interrupt.c
@@ -249,8 +249,7 @@ INLINE UINT32 ArchIsIntActive(VOID)
  **************************************************************************** */
 VOID HalHwiDefaultHandler(VOID)
 {
-    UINT32 irqNum = HwiNumGet();
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, irqNum);
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
     while (1) {}
 }