Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc2ab44 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging:r8188eu: remove rf_chip member of hal_data_8188e structure 



This member is constant.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f8f444d

drivers/staging/rtl8188eu/hal/phy.c

+1 −12
Original line number Diff line number Diff line
@@ -210,13 +210,6 @@ static void phy_set_bw_mode_callback(struct adapter *adapt) 
	u8 reg_bw_opmode;

	u8 reg_prsr_rsc;



	if (hal_data->rf_chip == RF_PSEUDO_11N)

		return;



	/*  There is no 40MHz mode in RF_8225. */

	if (hal_data->rf_chip == RF_8225)

		return;



	if (adapt->bDriverStopped)

		return;
@@ -265,7 +258,6 @@ static void phy_set_bw_mode_callback(struct adapter *adapt) 
	}



	/* Set RF related register */

	if (hal_data->rf_chip == RF_6052)

	rtl88eu_phy_rf6052_set_bandwidth(adapt, hal_data->CurrentChannelBW);

}
@@ -307,9 +299,6 @@ void rtw_hal_set_chan(struct adapter *adapt, u8 channel) 
	struct hal_data_8188e *hal_data = adapt->HalData;

	u8 tmpchannel = hal_data->CurrentChannel;



	if (hal_data->rf_chip == RF_PSEUDO_11N)

		return;



	if (channel == 0)

		channel = 1;

drivers/staging/rtl8188eu/hal/usb_halinit.c

+0 −6
Original line number Diff line number Diff line
@@ -1096,18 +1096,12 @@ static void _ReadPROMContent( 
	readAdapterInfo_8188EU(Adapter);

}



static void _ReadRFType(struct adapter *Adapter)

{

	Adapter->HalData->rf_chip = RF_6052;

}



void rtw_hal_read_chip_info(struct adapter *Adapter)

{

	unsigned long start = jiffies;



	MSG_88E("====> %s\n", __func__);



	_ReadRFType(Adapter);/* rf_chip -> _InitRFType() */

	_ReadPROMContent(Adapter);



	MSG_88E("<==== %s in %d ms\n", __func__,

drivers/staging/rtl8188eu/include/rtl8188e_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ struct hal_data_8188e { 
	u16	BasicRateSet;



	/* rf_ctrl */

	u8	rf_chip;

	u8	NumTotalRFPath;



	u8	BoardType;