Commit 20a77667 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: merge _ReadLEDSetting() into ReadAdapterInfo8188EU() 



Function _ReadLEDSetting() sets only a single variable and the only
user is ReadAdapterInfo8188EU(). Remove _ReadLEDSetting() and set the
variable in ReadAdapterInfo8188EU() directly.

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


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

drivers/staging/r8188eu/hal/usb_halinit.c

+2 −7
Original line number Diff line number Diff line
@@ -913,12 +913,6 @@ unsigned int rtl8188eu_inirp_init(struct adapter *Adapter) 
/*	EEPROM/EFUSE Content Parsing */

/*  */

/*  */

static void _ReadLEDSetting(struct adapter *Adapter, u8 *PROMContent, bool AutoloadFail)

{

	struct led_priv *pledpriv = &Adapter->ledpriv;



	pledpriv->bRegUseLed = true;

}



static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool AutoLoadFail)

{
@@ -938,6 +932,7 @@ static void Hal_EfuseParseMACAddr_8188EU(struct adapter *adapt, u8 *hwinfo, bool 
void ReadAdapterInfo8188EU(struct adapter *Adapter)

{

	struct eeprom_priv *eeprom = &Adapter->eeprompriv;

	struct led_priv *ledpriv = &Adapter->ledpriv;

	u8 eeValue;



	/*  Read EEPROM size before call any EEPROM function */
@@ -965,7 +960,7 @@ void ReadAdapterInfo8188EU(struct adapter *Adapter) 
	Hal_ReadAntennaDiversity88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);

	Hal_ReadThermalMeter_88E(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);



	_ReadLEDSetting(Adapter, eeprom->efuse_eeprom_data, eeprom->bautoload_fail_flag);

	ledpriv->bRegUseLed = true;

}



static void ResumeTxBeacon(struct adapter *adapt)