From b1e6583246710c779d7f8d975dabdf0b77557155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E6=98=95?= <tianxin7@xiaomi.com>
Date: Fri, 13 Jan 2023 11:57:10 +0800
Subject: [PATCH] wireless/wapi:rework wapi error print in util.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 田昕 <tianxin7@xiaomi.com>
---
 wireless/wapi/src/util.h | 74 +++++++++-------------------------------
 1 file changed, 17 insertions(+), 57 deletions(-)

diff --git a/wireless/wapi/src/util.h b/wireless/wapi/src/util.h
index b5b1e49bf..56a513ab7 100644
--- a/wireless/wapi/src/util.h
+++ b/wireless/wapi/src/util.h
@@ -42,74 +42,34 @@
  ****************************************************************************/
 
 #include <string.h>
+#include <debug.h>
 #include <errno.h>
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-#ifdef DEBUG_WIRELESS_ERROR
-#  ifdef CONFIG_LIBC_STRERROR
-#    define WAPI_IOCTL_STRERROR(cmd,errcode) \
-      fprintf( \
-        stderr, "%s:%d:%s():ioctl(%s): %s\n", \
-        __FILE__, __LINE__, __func__, \
-        wapi_ioctl_command_name(cmd), strerror(errcode))
-
-#    define WAPI_STRERROR(fmt, ...) \
-      fprintf( \
-          stderr, "%s:%d:%s():" fmt ": %s\n", \
-        __FILE__, __LINE__, __func__, \
-        ## __VA_ARGS__, strerror(errno))
-#  else
-#    define WAPI_IOCTL_STRERROR(cmd,errcode) \
-      fprintf( \
-        stderr, "%s:%d:%s():ioctl(%s): %d\n", \
-        __FILE__, __LINE__, __func__, \
-        wapi_ioctl_command_name(cmd), errcode)
-
-#    define WAPI_STRERROR(fmt, ...) \
-      fprintf( \
-          stderr, "%s:%d:%s():" fmt ": %d\n", \
-        __FILE__, __LINE__, __func__, \
-        ## __VA_ARGS__, errno)
-#  endif
-
-#  define WAPI_ERROR(fmt, ...) \
-    fprintf( \
-      stderr, "%s:%d:%s(): " fmt , \
-      __FILE__, __LINE__, __func__, ## __VA_ARGS__)
+#ifdef CONFIG_LIBC_STRERROR
+#  define WAPI_IOCTL_STRERROR(cmd,errcode) \
+    wlerr("ioctl(%s): %s\n", \
+      wapi_ioctl_command_name(cmd), strerror(errcode))
 
+#  define WAPI_STRERROR(fmt, ...) \
+    wlerr(fmt ": %s\n", \
+      ## __VA_ARGS__, strerror(errno))
 #else
-#  ifdef CONFIG_LIBC_STRERROR
-#    define WAPI_IOCTL_STRERROR(cmd,errcode) \
-      fprintf( \
-        stderr, "ioctl(%s): %s\n", \
-        wapi_ioctl_command_name(cmd), strerror(errcode))
-
-#    define WAPI_STRERROR(fmt, ...) \
-      fprintf( \
-        stderr, fmt ": %s\n", \
-        ## __VA_ARGS__, strerror(errno))
-#  else
-#    define WAPI_IOCTL_STRERROR(cmd,errcode) \
-      fprintf( \
-        stderr, "ioctl(%s): %d\n", \
-        wapi_ioctl_command_name(cmd), errcode)
-
-#    define WAPI_STRERROR(fmt, ...) \
-      fprintf( \
-        stderr, fmt ": %d\n", \
-        ## __VA_ARGS__, errno)
-#  endif
-
-#  define WAPI_ERROR(fmt, ...) \
-    fprintf( \
-      stderr, fmt , \
-      ## __VA_ARGS__)
+#  define WAPI_IOCTL_STRERROR(cmd,errcode) \
+    wlerr("ioctl(%s): %d\n", \
+      wapi_ioctl_command_name(cmd), errcode)
 
+#  define WAPI_STRERROR(fmt, ...) \
+    wlerr(fmt ": %d\n", \
+      ## __VA_ARGS__, errno)
 #endif
 
+#define WAPI_ERROR(fmt, ...) \
+  wlerr(fmt , ## __VA_ARGS__)
+
 #define WAPI_VALIDATE_PTR(ptr) \
   if (ptr == NULL) \
     { \