Commit d7e065b3 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Rename rateCountDi.., ContinueDif.. and TxCounter 



Rename variable rateCountDiffRecord to rate_count_diff_rec,
ContinueDiffCount to continue_diff_count and TxCounter to tx_counter to
avoid CamelCase which is not accepted by checkpatch.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/c1e168e60a987ae64b64490c04ad79fd0f2f7583.1673812849.git.philipp.g.hortmann@gmail.com


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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2154,10 +2154,10 @@ bool rtl92e_is_tx_stuck(struct net_device *dev) 
	bool	bStuck = false;

	bool	bStuck = false;

	u16	RegTxCounter = rtl92e_readw(dev, 0x128);

	u16	RegTxCounter = rtl92e_readw(dev, 0x128);





	if (priv->TxCounter == RegTxCounter)

	if (priv->tx_counter == RegTxCounter)

		bStuck = true;

		bStuck = true;





	priv->TxCounter = RegTxCounter;

	priv->tx_counter = RegTxCounter;





	return bStuck;

	return bStuck;

}

}

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -510,8 +510,8 @@ struct r8192_priv { 




	bool		bfsync_processing;

	bool		bfsync_processing;

	u32		rate_record;

	u32		rate_record;

	u32		rateCountDiffRecord;

	u32		rate_count_diff_rec;

	u32		ContinueDiffCount;

	u32		continue_diff_count;

	bool		bswitch_fsync;

	bool		bswitch_fsync;

	u8		framesync;

	u8		framesync;

	u32		framesyncC34;

	u32		framesyncC34;
@@ -520,7 +520,7 @@ struct r8192_priv { 
	u32		reset_count;

	u32		reset_count;





	enum reset_type rst_progress;

	enum reset_type rst_progress;

	u16		TxCounter;

	u16		tx_counter;

	u16		rx_ctr;

	u16		rx_ctr;

	bool		bResetInProgress;

	bool		bResetInProgress;

	bool		force_reset;

	bool		force_reset;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+13 −13
Original line number Original line Diff line number Diff line
@@ -2008,31 +2008,31 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) 
					  priv->rate_record;

					  priv->rate_record;

		else

		else

			rate_count_diff = rate_count - priv->rate_record;

			rate_count_diff = rate_count - priv->rate_record;

		if (rate_count_diff < priv->rateCountDiffRecord) {

		if (rate_count_diff < priv->rate_count_diff_rec) {





			u32 DiffNum = priv->rateCountDiffRecord -

			u32 DiffNum = priv->rate_count_diff_rec -

				      rate_count_diff;

				      rate_count_diff;

			if (DiffNum >=

			if (DiffNum >=

			    priv->rtllib->fsync_seconddiff_ratethreshold)

			    priv->rtllib->fsync_seconddiff_ratethreshold)

				priv->ContinueDiffCount++;

				priv->continue_diff_count++;

			else

			else

				priv->ContinueDiffCount = 0;

				priv->continue_diff_count = 0;





			if (priv->ContinueDiffCount >= 2) {

			if (priv->continue_diff_count >= 2) {

				bSwitchFromCountDiff = true;

				bSwitchFromCountDiff = true;

				priv->ContinueDiffCount = 0;

				priv->continue_diff_count = 0;

			}

			}

		} else {

		} else {

			priv->ContinueDiffCount = 0;

			priv->continue_diff_count = 0;

		}

		}





		if (rate_count_diff <=

		if (rate_count_diff <=

		    priv->rtllib->fsync_firstdiff_ratethreshold) {

		    priv->rtllib->fsync_firstdiff_ratethreshold) {

			bSwitchFromCountDiff = true;

			bSwitchFromCountDiff = true;

			priv->ContinueDiffCount = 0;

			priv->continue_diff_count = 0;

		}

		}

		priv->rate_record = rate_count;

		priv->rate_record = rate_count;

		priv->rateCountDiffRecord = rate_count_diff;

		priv->rate_count_diff_rec = rate_count_diff;

		if (priv->undecorated_smoothed_pwdb >

		if (priv->undecorated_smoothed_pwdb >

		    priv->rtllib->fsync_rssi_threshold &&

		    priv->rtllib->fsync_rssi_threshold &&

		    bSwitchFromCountDiff) {

		    bSwitchFromCountDiff) {
@@ -2073,7 +2073,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t) 
			rtl92e_writeb(dev, 0xC36, 0x5c);

			rtl92e_writeb(dev, 0xC36, 0x5c);

			rtl92e_writeb(dev, 0xC3e, 0x96);

			rtl92e_writeb(dev, 0xC3e, 0x96);

		}

		}

		priv->ContinueDiffCount = 0;

		priv->continue_diff_count = 0;

		rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);

		rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);

	}

	}

}

}
@@ -2114,7 +2114,7 @@ static void _rtl92e_dm_end_sw_fsync(struct net_device *dev) 
		rtl92e_writeb(dev, 0xC3e, 0x96);

		rtl92e_writeb(dev, 0xC3e, 0x96);

	}

	}





	priv->ContinueDiffCount = 0;

	priv->continue_diff_count = 0;

	rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);

	rtl92e_writel(dev, rOFDM0_RxDetector2, 0x465c52cd);

}

}
@@ -2125,8 +2125,8 @@ static void _rtl92e_dm_start_sw_fsync(struct net_device *dev) 
	u32 rate_bitmap;

	u32 rate_bitmap;





	priv->rate_record = 0;

	priv->rate_record = 0;

	priv->ContinueDiffCount = 0;

	priv->continue_diff_count = 0;

	priv->rateCountDiffRecord = 0;

	priv->rate_count_diff_rec = 0;

	priv->bswitch_fsync  = false;

	priv->bswitch_fsync  = false;





	if (priv->rtllib->mode == WIRELESS_MODE_N_24G) {

	if (priv->rtllib->mode == WIRELESS_MODE_N_24G) {