Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: r8188eu: remove header odm_precomp.h

After previous cleanups the header odm_precomp.h only contains
includes and one unused define now. Remove the header and adjust
the includes in affected files.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20211229205108.26373-33-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Michael Straube and committed by
Greg Kroah-Hartman
512cdc60 489257e6

+18 -59
+2 -15
drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /* Copyright (c) Realtek Semiconductor Corp. 3 - Module Name: 4 - RateAdaptive.c 2 + /* Copyright (c) Realtek Semiconductor Corp. */ 5 3 6 - Abstract: 7 - Implement Rate Adaptive functions for common operations. 8 - 9 - Major Change History: 10 - When Who What 11 - ---------- --------------- ------------------------------- 12 - 2011-08-12 Page Create. 13 - 14 - --*/ 15 - #include "../include/odm_precomp.h" 16 - 17 - /* Rate adaptive parameters */ 4 + #include "../include/drv_types.h" 18 5 19 6 static u8 RETRY_PENALTY[PERENTRY][RETRYSIZE + 1] = { 20 7 {5, 4, 3, 2, 0, 3}, /* 92 , idx = 0 */
-1
drivers/staging/r8188eu/hal/HalHWImg8188E_BB.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 5 4 #include "../include/rtw_iol.h" 6 5 7 6 #define read_next_pair(array, v1, v2, i) \
-1
drivers/staging/r8188eu/hal/HalHWImg8188E_MAC.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 5 4 #include "../include/rtw_iol.h" 6 5 7 6 static bool Checkcondition(const u32 condition, const u32 hex)
-1
drivers/staging/r8188eu/hal/HalHWImg8188E_RF.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 5 4 #include "../include/rtw_iol.h" 6 5 7 6 static bool CheckCondition(const u32 Condition, const u32 Hex)
+1 -1
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/drv_types.h" 5 5 6 6 /*---------------------------Define Local Constant---------------------------*/ 7 7 /* 2010/04/25 MH Define the max tx power tracking tx agc power. */
+1 -1
drivers/staging/r8188eu/hal/odm.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/drv_types.h" 5 5 6 6 /* avoid to warn in FreeBSD ==> To DO modify */ 7 7 static u32 EDCAParam[HT_IOT_PEER_MAX][3] = {
+1 -1
drivers/staging/r8188eu/hal/odm_HWConfig.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/drv_types.h" 5 5 6 6 #define READ_AND_CONFIG READ_AND_CONFIG_MP 7 7
+1 -1
drivers/staging/r8188eu/hal/odm_RTL8188E.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/drv_types.h" 5 5 6 6 static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm) 7 7 {
+1 -1
drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/drv_types.h" 5 5 6 6 static void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, 7 7 u32 Data, enum rf_radio_path RF_PATH,
+1 -1
drivers/staging/r8188eu/hal/odm_debug.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 2 /* Copyright(c) 2007 - 2011 Realtek Corporation. */ 3 3 4 - #include "../include/odm_precomp.h" 4 + #include "../include/rtw_debug.h" 5 5 6 6 u32 GlobalDebugLevel;
-34
drivers/staging/r8188eu/include/odm_precomp.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ 2 - /* Copyright(c) 2007 - 2011 Realtek Corporation. i*/ 3 - 4 - #ifndef __ODM_PRECOMP_H__ 5 - #define __ODM_PRECOMP_H__ 6 - 7 - #include "odm_types.h" 8 - 9 - #define TEST_FALG___ 1 10 - 11 - /* 2 Config Flags and Structs - defined by each ODM Type */ 12 - 13 - #include "osdep_service.h" 14 - #include "drv_types.h" 15 - #include "hal_intf.h" 16 - 17 - /* 2 OutSrc Header Files */ 18 - 19 - #include "odm.h" 20 - #include "odm_HWConfig.h" 21 - #include "odm_RegDefine11N.h" 22 - 23 - #include "HalPhyRf_8188e.h"/* for IQK,LCK,Power-tracking */ 24 - #include "Hal8188ERateAdaptive.h"/* for RA,Power training */ 25 - #include "rtl8188e_hal.h" 26 - 27 - #include "HalHWImg8188E_MAC.h" 28 - #include "HalHWImg8188E_RF.h" 29 - #include "HalHWImg8188E_BB.h" 30 - 31 - #include "odm_RegConfig8188E.h" 32 - #include "odm_RTL8188E.h" 33 - 34 - #endif /* __ODM_PRECOMP_H__ */
+10 -1
drivers/staging/r8188eu/include/rtl8188e_hal.h
··· 14 14 #include "rtl8188e_xmit.h" 15 15 #include "rtl8188e_cmd.h" 16 16 #include "rtw_efuse.h" 17 - #include "odm_precomp.h" 17 + #include "odm_types.h" 18 18 #include "odm.h" 19 + #include "odm_HWConfig.h" 20 + #include "odm_RegDefine11N.h" 21 + #include "HalPhyRf_8188e.h" 22 + #include "Hal8188ERateAdaptive.h" 23 + #include "HalHWImg8188E_MAC.h" 24 + #include "HalHWImg8188E_RF.h" 25 + #include "HalHWImg8188E_BB.h" 26 + #include "odm_RegConfig8188E.h" 27 + #include "odm_RTL8188E.h" 19 28 20 29 /* RTL8188E Power Configuration CMDs for USB/SDIO interfaces */ 21 30 #define Rtl8188E_NIC_PWR_ON_FLOW rtl8188E_power_on_flow