From 57a2ce4f20330df35d388028f07ce61ab6d4fce2 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 17 Dec 2019 22:28:41 +0100 Subject: [PATCH] Revert: Test fix for latest kernel which changed 'asm' to 'asm_inline' --- core/rtw_debug.c | 5 ----- include/byteorder/generic.h | 5 ----- include/osdep_service_linux.h | 5 ----- os_dep/linux/ioctl_mp.c | 5 ----- os_dep/linux/rtw_cfgvendor.c | 5 ----- os_dep/osdep_service.c | 5 ----- 6 files changed, 30 deletions(-) diff --git a/core/rtw_debug.c b/core/rtw_debug.c index aae53b9..22ff44f 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -17,11 +17,6 @@ #include #include -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - #ifdef CONFIG_RTW_DEBUG const char *rtw_log_level_str[] = { "_DRV_NONE_ = 0", diff --git a/include/byteorder/generic.h b/include/byteorder/generic.h index 9286cd7..f85114b 100644 --- a/include/byteorder/generic.h +++ b/include/byteorder/generic.h @@ -15,11 +15,6 @@ #ifndef _LINUX_BYTEORDER_GENERIC_H #define _LINUX_BYTEORDER_GENERIC_H -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - /* * linux/byteorder_generic.h * Generic Byte-reordering support diff --git a/include/osdep_service_linux.h b/include/osdep_service_linux.h index 7f442a2..2f84f97 100644 --- a/include/osdep_service_linux.h +++ b/include/osdep_service_linux.h @@ -15,11 +15,6 @@ #ifndef __OSDEP_LINUX_SERVICE_H_ #define __OSDEP_LINUX_SERVICE_H_ -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - #include #include #include diff --git a/os_dep/linux/ioctl_mp.c b/os_dep/linux/ioctl_mp.c index 873408e..a459afb 100644 --- a/os_dep/linux/ioctl_mp.c +++ b/os_dep/linux/ioctl_mp.c @@ -14,11 +14,6 @@ *****************************************************************************/ #if defined(CONFIG_MP_INCLUDED) -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - #ifdef MARK_KERNEL_PFU #include #include diff --git a/os_dep/linux/rtw_cfgvendor.c b/os_dep/linux/rtw_cfgvendor.c index c20cd42..d906163 100644 --- a/os_dep/linux/rtw_cfgvendor.c +++ b/os_dep/linux/rtw_cfgvendor.c @@ -15,11 +15,6 @@ #include -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - #ifdef CONFIG_IOCTL_CFG80211 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) || defined(RTW_VENDOR_EXT_SUPPORT) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index c51d03a..7c6d120 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -13,11 +13,6 @@ * *****************************************************************************/ -#ifdef asm_inline -#undef asm_inline -#define asm_inline asm -#endif - #define _OSDEP_SERVICE_C_ #include