Commit fc577e46 authored by Phillip Potter's avatar Phillip Potter Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove include/odm_debug.h 



Remove include/odm_debug.h in its entirety. To do this, first:

(1) Remove DebugLevel and DebugComponents members from the struct
    odm_dm_struct definition, and any uses of these elsewhere in
    the driver.

(2) Remove the function ODM_InitDebugSetting from hal/odm_debug.c
    whilst leaving the file in place for now as it contains a global
    which is still used and will be removed by further cleanup code.
    Also remove all of its callers. All the function does is set the
    members mentioned above.

(3) Remove the now redundant constants and their usages:
    ODM_CMNINFO_DBG_LEVEL
    ODM_CMNINFO_DBG_COMP
    HW_DEF_ODM_DBG_FLAG
    HW_DEF_FA_CNT_DUMP
    This includes usage within a few hexadecimal ioctl switch cases
    in os_dep/ioctl_linux.c (although only the call itself within
    0x11 as it contains additional code currently).

(4) Finally, remove the file itself and its inclusion within
    include/odm_precomp.h, as none of the remaining content is used
    from anywhere else in the driver.

Signed-off-by: default avatarPhillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20210731003937.68615-15-phil@philpotter.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f8a84691

drivers/staging/r8188eu/hal/odm.c

+0 −8
Original line number Diff line number Diff line
@@ -416,12 +416,6 @@ void ODM_CmnInfoUpdate(struct odm_dm_struct *pDM_Odm, u32 CmnInfo, u64 Value) 
	case	ODM_CMNINFO_RSSI_MIN:

		pDM_Odm->RSSI_Min = (u8)Value;

		break;

	case	ODM_CMNINFO_DBG_COMP:

		pDM_Odm->DebugComponents = Value;

		break;

	case	ODM_CMNINFO_DBG_LEVEL:

		pDM_Odm->DebugLevel = (u32)Value;

		break;

	case	ODM_CMNINFO_RA_THRESHOLD_HIGH:

		pDM_Odm->RateAdaptive.HighRSSIThresh = (u8)Value;

		break;
@@ -439,8 +433,6 @@ void odm_CommonInfoSelfInit(struct odm_dm_struct *pDM_Odm) 
		pDM_Odm->AntDivType = CG_TRX_HW_ANTDIV;

	if (pDM_Odm->SupportICType & (ODM_RTL8723A))

		pDM_Odm->AntDivType = CGCS_RX_SW_ANTDIV;



	ODM_InitDebugSetting(pDM_Odm);

}



void odm_CommonInfoSelfUpdate(struct odm_dm_struct *pDM_Odm)

drivers/staging/r8188eu/hal/odm_debug.c

+0 −7
Original line number Diff line number Diff line
@@ -3,11 +3,4 @@ 


#include "../include/odm_precomp.h"



void ODM_InitDebugSetting(struct odm_dm_struct *pDM_Odm)

{

	pDM_Odm->DebugLevel = ODM_DBG_TRACE;



	pDM_Odm->DebugComponents = 0;

}



u32 GlobalDebugLevel;

drivers/staging/r8188eu/hal/rtl8188e_dm.c

+0 −1
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter) 


	memset(pdmpriv, 0, sizeof(struct dm_priv));

	Init_ODM_ComInfo_88E(Adapter);

	ODM_InitDebugSetting(podmpriv);

}



void rtl8188e_deinit_dm_priv(struct adapter *Adapter)

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −23
Original line number Diff line number Diff line
@@ -2035,12 +2035,6 @@ GetHalDefVar8188EUsb( 
			}

		}

		break;

	case HW_DEF_ODM_DBG_FLAG:

		{

			struct odm_dm_struct *dm_ocm = &(haldata->odmpriv);

			pr_info("dm_ocm->DebugComponents = 0x%llx\n", dm_ocm->DebugComponents);

		}

		break;

	case HAL_DEF_DBG_DUMP_RXPKT:

		*((u8 *)pValue) = haldata->bDumpRxPkt;

		break;
@@ -2099,23 +2093,6 @@ static u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eV 
	case HAL_DEF_DBG_DUMP_TXPKT:

		haldata->bDumpTxPkt = *((u8 *)pValue);

		break;

	case HW_DEF_FA_CNT_DUMP:

		{

			u8 bRSSIDump = *((u8 *)pValue);

			struct odm_dm_struct *dm_ocm = &(haldata->odmpriv);

			if (bRSSIDump)

				dm_ocm->DebugComponents	=	ODM_COMP_DIG|ODM_COMP_FA_CNT	;

			else

				dm_ocm->DebugComponents	= 0;

		}

		break;

	case HW_DEF_ODM_DBG_FLAG:

		{

			u64	DebugComponents = *((u64 *)pValue);

			struct odm_dm_struct *dm_ocm = &(haldata->odmpriv);

			dm_ocm->DebugComponents = DebugComponents;

		}

		break;

	default:

		bResult = _FAIL;

		break;

drivers/staging/r8188eu/include/hal_intf.h

+0 −2
Original line number Diff line number Diff line
@@ -113,8 +113,6 @@ enum hal_def_variable { 
	HW_VAR_MAX_RX_AMPDU_FACTOR,

	HW_DEF_RA_INFO_DUMP,

	HAL_DEF_DBG_DUMP_TXPKT,

	HW_DEF_FA_CNT_DUMP,

	HW_DEF_ODM_DBG_FLAG,

};



enum hal_odm_variable {