Commit 72f1f752 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Simplify rtl92e_set_bandwidth 



Move phy version check outside of the loop.

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 99d4f5d2

drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c

+18 −35
Original line number Diff line number Diff line
@@ -28,49 +28,32 @@ void rtl92e_set_bandwidth(struct net_device *dev, 
	u8	eRFPath;

	struct r8192_priv *priv = rtllib_priv(dev);



	if (priv->card_8192_version != VERSION_8190_BD &&

	    priv->card_8192_version != VERSION_8190_BE) {

		netdev_warn(dev, "%s(): Unknown HW version.\n", __func__);

		return;

	}



	for (eRFPath = 0; eRFPath < priv->NumTotalRFPath; eRFPath++) {

		if (!rtl92e_is_legal_rf_path(dev, eRFPath))

				continue;



		switch (Bandwidth) {

		case HT_CHANNEL_WIDTH_20:

			if (priv->card_8192_version == VERSION_8190_BD ||

			    priv->card_8192_version == VERSION_8190_BE) {

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x0b, bMask12Bits, 0x100);

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x2c, bMask12Bits, 0x3d7);

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x0e, bMask12Bits, 0x021);



			} else {

				netdev_warn(dev, "%s(): Unknown HW version.\n",

					    __func__);

			}



			break;

		case HT_CHANNEL_WIDTH_20_40:

			if (priv->card_8192_version == VERSION_8190_BD ||

			    priv->card_8192_version == VERSION_8190_BE) {

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x0b, bMask12Bits, 0x300);

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x2c, bMask12Bits, 0x3ff);

				rtl92e_set_rf_reg(dev,

						  (enum rf90_radio_path)eRFPath,

			rtl92e_set_rf_reg(dev, (enum rf90_radio_path)eRFPath,

					  0x0e, bMask12Bits, 0x0e1);



			} else {

				netdev_warn(dev, "%s(): Unknown HW version.\n",

					    __func__);

			}





			break;

		default:

			netdev_err(dev, "%s(): Unknown bandwidth: %#X\n",