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

Commit 6b8b810f authored by Luca Ceresoli's avatar Luca Ceresoli Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: remove unused members from struct recv_priv 



Since commit da25a8ec ("staging: rtl8188eu: remove unused
debugging functions") is_signal_dbg is never set to true, so the code
under if (adapter->recvpriv.is_signal_dbg) is dead. Remove the
variable and the dead code.

The signal_strength_dbg was referenced only in the code that is being
removed, so remove it as well.

Also fix coding style issues in the touched lines.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Ivan Safonov <insafonov@gmail.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9fe7b29c

drivers/staging/rtl8188eu/core/rtw_recv.c

+39 −36
Original line number Diff line number Diff line
@@ -2071,26 +2071,28 @@ static void rtw_signal_stat_timer_hdl(unsigned long data) 
	u8 avg_signal_qual = 0;

	u8 _alpha = 3; /*  this value is based on converging_constant = 5000 and sampling_interval = 1000 */



	if (adapter->recvpriv.is_signal_dbg) {

		/* update the user specific value, signal_strength_dbg, to signal_strength, rssi */

		adapter->recvpriv.signal_strength = adapter->recvpriv.signal_strength_dbg;

		adapter->recvpriv.rssi = (s8)translate_percentage_to_dbm((u8)adapter->recvpriv.signal_strength_dbg);

	} else {

		if (recvpriv->signal_strength_data.update_req == 0) {/*  update_req is clear, means we got rx */

	if (recvpriv->signal_strength_data.update_req == 0) {

		/* update_req is clear, means we got rx */

		avg_signal_strength = recvpriv->signal_strength_data.avg_val;

			/*  after avg_vals are acquired, we can re-stat the signal values */

		/* after avg_vals are acquired, we can re-stat the signal

		 * values

		 */

		recvpriv->signal_strength_data.update_req = 1;

	}



		if (recvpriv->signal_qual_data.update_req == 0) {/*  update_req is clear, means we got rx */

	if (recvpriv->signal_qual_data.update_req == 0) {

		/* update_req is clear, means we got rx */

		avg_signal_qual = recvpriv->signal_qual_data.avg_val;

			/*  after avg_vals are acquired, we can re-stat the signal values */

		/* after avg_vals are acquired, we can re-stat the signal

		 * values

		 */

		recvpriv->signal_qual_data.update_req = 1;

	}



	/* update value of signal_strength, rssi, signal_qual */

	if (check_fwstate(&adapter->mlmepriv, _FW_UNDER_SURVEY) == false) {

			tmp_s = avg_signal_strength+(_alpha-1)*recvpriv->signal_strength;

		tmp_s = avg_signal_strength +

			(_alpha - 1) * recvpriv->signal_strength;

		if (tmp_s % _alpha)

			tmp_s = tmp_s / _alpha + 1;

		else
@@ -2098,7 +2100,8 @@ static void rtw_signal_stat_timer_hdl(unsigned long data) 
		if (tmp_s > 100)

			tmp_s = 100;



			tmp_q = avg_signal_qual+(_alpha-1)*recvpriv->signal_qual;

		tmp_q = avg_signal_qual +

			(_alpha - 1) * recvpriv->signal_qual;

		if (tmp_q % _alpha)

			tmp_q = tmp_q / _alpha + 1;

		else
@@ -2110,6 +2113,6 @@ static void rtw_signal_stat_timer_hdl(unsigned long data) 
		recvpriv->rssi = (s8)translate_percentage_to_dbm(tmp_s);

		recvpriv->signal_qual = tmp_q;

	}

	}



	rtw_set_signal_stat_timer(recvpriv);

}

drivers/staging/rtl8188eu/include/rtw_recv.h

+0 −2
Original line number Diff line number Diff line
@@ -179,8 +179,6 @@ struct recv_priv { 
	struct recv_buf *precv_buf;    /*  4 alignment */

	struct __queue free_recv_buf_queue;

	/* For display the phy informatiom */

	u8 is_signal_dbg;	/*  for debug */

	u8 signal_strength_dbg;	/*  for debug */

	s8 rssi;

	s8 rxpwdb;

	u8 signal_strength;