Commit 75ba99b4 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove PGMaxGroup from struct hal_data_8188e 



the variable PGMaxGroup in struct hal_data_8188e is set to 13 and
never changed. We can use the already defined constant MAX_PG_GROUP,
which is 13, and remove PGMaxGroup from struct hal_data_8188e.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220201084259.7497-3-straube.linux@gmail.com


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

drivers/staging/r8188eu/hal/rtl8188e_rf6052.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void get_rx_power_val_by_reg(struct adapter *Adapter, u8 Channel, 
			/*  increase power diff defined by Realtek for regulatory */

			if (pHalData->pwrGroupCnt == 1)

				chnlGroup = 0;

			if (pHalData->pwrGroupCnt >= pHalData->PGMaxGroup) {

			if (pHalData->pwrGroupCnt >= MAX_PG_GROUP) {

				if (Channel < 3)			/*  Channel 1-2 */

					chnlGroup = 0;

				else if (Channel < 6)		/*  Channel 3-5 */

drivers/staging/r8188eu/hal/usb_halinit.c

+0 −1
Original line number Diff line number Diff line
@@ -1738,7 +1738,6 @@ void rtl8188eu_init_default_value(struct adapter *adapt) 
	haldata->odmpriv.RFCalibrateInfo.bIQKInitialized = false;

	haldata->odmpriv.RFCalibrateInfo.TM_Trigger = 0;/* for IQK */

	haldata->pwrGroupCnt = 0;

	haldata->PGMaxGroup = 13;

	haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP_index = 0;

	for (i = 0; i < HP_THERMAL_NUM; i++)

		haldata->odmpriv.RFCalibrateInfo.ThermalValue_HP[i] = 0;

drivers/staging/r8188eu/include/rtl8188e_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ struct txpowerinfo24g { 


struct hal_data_8188e {

	struct HAL_VERSION	VersionID;

	u8	PGMaxGroup;

	/* current WIFI_PHY values */

	u32	ReceiveConfig;

	enum ht_channel_width CurrentChannelBW;