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

Commit 285b7c00 authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Fix UNNECESSARY_ELSE warning 



Fix checkpatch warnings 'else is not generally useful after a break or return'

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

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

+34 −38
Original line number Diff line number Diff line
@@ -2025,6 +2025,7 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, 
				  struct sk_buff *skb)

{

	struct r8192_priv *priv = rtllib_priv(dev);

	struct rx_fwinfo *pDrvInfo = NULL;



	stats->bICV = pdesc->ICV;

	stats->bCRC = pdesc->CRC32;
@@ -2046,8 +2047,7 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, 
				priv->stats.rxcrcerrmid++;

		}

		return false;

	} else {

		struct rx_fwinfo *pDrvInfo = NULL;

	}



	stats->RxDrvInfoSize = pdesc->RxDrvInfoSize;

	stats->RxBufShift = ((pdesc->Shift)&0x03);
@@ -2091,7 +2091,6 @@ bool rtl8192_rx_query_status_desc(struct net_device *dev, 
	stats->ntotalfrag = 1;

	return true;

}

}



void rtl8192_halt_adapter(struct net_device *dev, bool reset)

{
@@ -2314,7 +2313,6 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev) 
	  (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M)))) {

		if (rx_chk_cnt < 2)

			return bStuck;

		else

		rx_chk_cnt = 0;

	} else if ((((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&

		  (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) ||
@@ -2323,12 +2321,10 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev) 
		priv->undecorated_smoothed_pwdb >= VeryLowRSSI) {

		if (rx_chk_cnt < 4)

			return bStuck;

		else

		rx_chk_cnt = 0;

	} else {

		if (rx_chk_cnt < 8)

			return bStuck;

		else

		rx_chk_cnt = 0;

	}

drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c

+4 −6
Original line number Diff line number Diff line
@@ -940,14 +940,12 @@ static u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, 
			}



			if (CurrentCmd && CurrentCmd->CmdID == CmdID_End) {

				if ((*stage) == 2) {

				if ((*stage) == 2)

					return true;

				} else {

				(*stage)++;

				(*step) = 0;

				continue;

			}

			}



			if (!CurrentCmd)

				continue;

drivers/staging/rtl8192e/rtl8192e/rtl_cam.c

+3 −4
Original line number Diff line number Diff line
@@ -116,13 +116,12 @@ void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, 
				RT_TRACE(COMP_ERR, "%s(): RF is OFF.\n",

					__func__);

				return;

			} else {

			}

			down(&priv->rtllib->ips_sem);

			IPSLeave(dev);

			up(&priv->rtllib->ips_sem);

		}

	}

	}

	priv->rtllib->is_set_key = true;

	if (EntryNo >= TOTAL_CAM_ENTRY)

		RT_TRACE(COMP_ERR, "cam entry exceeds in setKey()\n");

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+101 −112
Original line number Diff line number Diff line
@@ -204,9 +204,9 @@ u8 read_nic_io_byte(struct net_device *dev, int x) 
	bool	bIsLegalPage = false;

	u8	Data = 0;



	if (u4bPage == 0) {

	if (u4bPage == 0)

		return 0xff&inb(dev->base_addr + x);

	} else {



	bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,

							     &u1PageMask);

	if (bIsLegalPage) {
@@ -217,7 +217,6 @@ u8 read_nic_io_byte(struct net_device *dev, int x) 
		Data = read_nic_io_byte(dev, (x & 0xff));

		write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));

	}

	}



	return Data;

}
@@ -229,9 +228,8 @@ u16 read_nic_io_word(struct net_device *dev, int x) 
	bool	bIsLegalPage = false;

	u16	Data = 0;



	if (u4bPage == 0) {

	if (u4bPage == 0)

		return inw(dev->base_addr + x);

	} else {

	bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,

							     &u1PageMask);

	if (bIsLegalPage) {
@@ -241,8 +239,6 @@ u16 read_nic_io_word(struct net_device *dev, int x) 
				  (u8)u4bPage));

		Data = read_nic_io_word(dev, (x & 0xff));

		write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));



		}

	}



	return Data;
@@ -255,9 +251,8 @@ u32 read_nic_io_dword(struct net_device *dev, int x) 
	bool	bIsLegalPage = false;

	u32	Data = 0;



	if (u4bPage == 0) {

	if (u4bPage == 0)

		return inl(dev->base_addr + x);

	} else {

	bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,

		       &u1PageMask);

	if (bIsLegalPage) {
@@ -267,8 +262,6 @@ u32 read_nic_io_dword(struct net_device *dev, int x) 
				  (u8)u4bPage));

		Data = read_nic_io_dword(dev, (x & 0xff));

		write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));



		}

	}



	return Data;
@@ -1331,10 +1324,10 @@ static short rtl8192_init(struct net_device *dev) 
	    dev->name, dev)) {

		netdev_err(dev, "Error allocating IRQ %d", dev->irq);

		return -1;

	} else {

	}



	priv->irq = dev->irq;

	RT_TRACE(COMP_INIT, "IRQ %d\n", dev->irq);

	}



	if (rtl8192_pci_initdescring(dev) != 0) {

		netdev_err(dev, "Endopoints initialization failed");
@@ -1932,7 +1925,8 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (queue_index == TXCMD_QUEUE) {

		rtl8192_tx_cmd(dev, skb);

		return 0;

	} else {

	}



	tcb_desc->RATRIndex = 7;

	tcb_desc->bTxDisableRateFallBack = 1;

	tcb_desc->bTxUseDriverAssingedRate = 1;
@@ -1941,8 +1935,6 @@ int rtl8192_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	ret = rtl8192_tx(dev, skb);

	if (ret != 0)

		kfree_skb(skb);

	}



	return ret;

}
@@ -2338,12 +2330,10 @@ static void rtl8192_rx_normal(struct net_device *dev) 
					[priv->rx_idx[rx_queue_idx]];

		struct sk_buff *skb = priv->rx_buf[rx_queue_idx]

				      [priv->rx_idx[rx_queue_idx]];



		if (pdesc->OWN) {

			return;

		} else {

		struct sk_buff *new_skb;



		if (pdesc->OWN)

			return;

		if (!priv->ops->rx_query_status_descriptor(dev, &stats,

		pdesc, skb))

			goto done;
@@ -2408,7 +2398,6 @@ static void rtl8192_rx_normal(struct net_device *dev) 
			dev_kfree_skb_any(skb);

			return;

		}

		}

done:

		pdesc->BufferAddress = *((dma_addr_t *)skb->cb);

		pdesc->OWN = 1;

drivers/staging/rtl8192e/rtl8192e/rtl_dm.c

+148 −159
Original line number Diff line number Diff line
@@ -378,9 +378,8 @@ static void dm_bandwidth_autoswitch(struct net_device *dev) 
	struct r8192_priv *priv = rtllib_priv(dev);



	if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20 ||

	   !priv->rtllib->bandwidth_auto_switch.bautoswitch_enable) {

	   !priv->rtllib->bandwidth_auto_switch.bautoswitch_enable)

		return;

	} else {

	if (priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz == false) {

		if (priv->undecorated_smoothed_pwdb <=

		    priv->rtllib->bandwidth_auto_switch.threshold_40Mhzto20Mhz)
@@ -389,8 +388,6 @@ static void dm_bandwidth_autoswitch(struct net_device *dev) 
		if (priv->undecorated_smoothed_pwdb >=

		    priv->rtllib->bandwidth_auto_switch.threshold_20Mhzto40Mhz)

			priv->rtllib->bandwidth_auto_switch.bforced_tx20Mhz = false;



		}

	}

}
@@ -581,7 +578,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev) 
					 "priv->CCKPresentAttentuation = %d\n",

					 priv->CCKPresentAttentuation);

				return;

			} else {

			}

			if (Avg_TSSI_Meas_from_driver < TSSI_13dBm - E_FOR_TX_POWER_TRACK) {

				if (RF_Type == RF_2T4R) {
@@ -722,7 +719,7 @@ static void dm_TXPowerTrackingCallback_TSSI(struct net_device *dev) 
				RT_TRACE(COMP_POWER_TRACKING, "tx power track--->limited\n");

				return;

			}

			}



			write_nic_byte(dev, Pw_Track_Flag, 0);

			Avg_TSSI_Meas_from_driver = 0;

			for (k = 0; k < 5; k++)
@@ -1401,14 +1398,13 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) 
		TxPowerCheckCnt = 5;

	else

		TxPowerCheckCnt = 2;

	if (!priv->btxpower_tracking) {

	if (!priv->btxpower_tracking)

		return;

	} else {



	if (priv->txpower_count  <= TxPowerCheckCnt) {

		priv->txpower_count++;

		return;

	}

	}



	if (!TM_Trigger) {

		{
@@ -1419,13 +1415,10 @@ static void dm_CheckTXPowerTracking_ThermalMeter(struct net_device *dev) 
		}

		TM_Trigger = 1;

		return;

	} else {

		netdev_info(dev,

			    "===============>Schedule TxPowerTrackingWorkItem\n");



	}

	netdev_info(dev, "===============>Schedule TxPowerTrackingWorkItem\n");

	queue_delayed_work_rsl(priv->priv_wq, &priv->txpower_tracking_wq, 0);

	TM_Trigger = 0;

		}



}
@@ -1835,7 +1828,6 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( 
		if (dm_digtable.dig_state == DM_STA_DIG_OFF &&

			(priv->reset_count == reset_cnt))

			return;

		else

		reset_cnt = priv->reset_count;



		dm_digtable.dig_highpwr_state = DM_STA_DIG_MAX;
@@ -1865,12 +1857,11 @@ static void dm_ctrl_initgain_byrssi_by_fwfalse_alarm( 
		    (priv->reset_count == reset_cnt)) {

			dm_ctrl_initgain_byrssi_highpwr(dev);

			return;

		} else {

		}

		if (priv->reset_count != reset_cnt)

			reset_flag = 1;



		reset_cnt = priv->reset_count;

		}



		dm_digtable.dig_state = DM_STA_DIG_ON;
@@ -1912,7 +1903,6 @@ static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) 
		if (dm_digtable.dig_highpwr_state == DM_STA_DIG_ON &&

			(priv->reset_count == reset_cnt_highpwr))

			return;

		else

		dm_digtable.dig_highpwr_state = DM_STA_DIG_ON;



		if (priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20)
@@ -1923,7 +1913,6 @@ static void dm_ctrl_initgain_byrssi_highpwr(struct net_device *dev) 
		if (dm_digtable.dig_highpwr_state == DM_STA_DIG_OFF &&

			(priv->reset_count == reset_cnt_highpwr))

			return;

		else

		dm_digtable.dig_highpwr_state = DM_STA_DIG_OFF;



		if (priv->undecorated_smoothed_pwdb < dm_digtable.rssi_high_power_lowthresh &&