staging: rtl8188eu: reduce indentation level in rtw_alloc_stainfo

Remove else-arm from if-else statement. Move the else code out of the
if-else and skip it by adding goto exit to the if block. The exit label
was directly after the else-arm, so there is no change in behaviour.
Reduces indentation level and clears a line over 80 characters
checkpatch warning.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20191026121135.181897-7-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
index 43925b1f43ef67c13aea060969111f2745f32fa1..776931b8bf72fa6716f4e848be777d015b61f897 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
+++ b/drivers/staging/rtl8188eu/core/rtw_sta_mgt.c
@@ -181,70 +181,71 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
                                        struct sta_info, list);
        if (!psta) {
                spin_unlock_bh(&pfree_sta_queue->lock);
-       } else {
-               list_del_init(&psta->list);
-               spin_unlock_bh(&pfree_sta_queue->lock);
-               _rtw_init_stainfo(psta);
-               memcpy(psta->hwaddr, hwaddr, ETH_ALEN);
-               index = wifi_mac_hash(hwaddr);
-               RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
-                        ("%s: index=%x", __func__, index));
-               if (index >= NUM_STA) {
-                       RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_,
-                                ("ERROR => %s: index >= NUM_STA", __func__));
-                       psta = NULL;
-                       goto exit;
-               }
-               phash_list = &pstapriv->sta_hash[index];
-
-               spin_lock_bh(&pstapriv->sta_hash_lock);
-               list_add_tail(&psta->hash_list, phash_list);
-               pstapriv->asoc_sta_count++;
-               spin_unlock_bh(&pstapriv->sta_hash_lock);
+               goto exit;
+       }
 
-               /* Commented by Albert 2009/08/13
-                * For the SMC router, the sequence number of first packet of
-                * WPS handshake will be 0. In this case, this packet will be
-                * dropped by recv_decache function if we use the 0x00 as the
-                * default value for tid_rxseq variable. So, we initialize the
-                * tid_rxseq variable as the 0xffff.
-                */
+       list_del_init(&psta->list);
+       spin_unlock_bh(&pfree_sta_queue->lock);
+       _rtw_init_stainfo(psta);
+       memcpy(psta->hwaddr, hwaddr, ETH_ALEN);
+       index = wifi_mac_hash(hwaddr);
+       RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
+                ("%s: index=%x", __func__, index));
+       if (index >= NUM_STA) {
+               RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_,
+                        ("ERROR => %s: index >= NUM_STA", __func__));
+               psta = NULL;
+               goto exit;
+       }
+       phash_list = &pstapriv->sta_hash[index];
 
-               for (i = 0; i < 16; i++)
-                       memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i],
-                              &wRxSeqInitialValue, 2);
+       spin_lock_bh(&pstapriv->sta_hash_lock);
+       list_add_tail(&psta->hash_list, phash_list);
+       pstapriv->asoc_sta_count++;
+       spin_unlock_bh(&pstapriv->sta_hash_lock);
 
-               RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
-                        ("alloc number_%d stainfo  with hwaddr = %pM\n",
-                        pstapriv->asoc_sta_count, hwaddr));
+       /* Commented by Albert 2009/08/13
+        * For the SMC router, the sequence number of first packet of
+        * WPS handshake will be 0. In this case, this packet will be
+        * dropped by recv_decache function if we use the 0x00 as the
+        * default value for tid_rxseq variable. So, we initialize the
+        * tid_rxseq variable as the 0xffff.
+        */
 
-               init_addba_retry_timer(pstapriv->padapter, psta);
+       for (i = 0; i < 16; i++)
+               memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i],
+                      &wRxSeqInitialValue, 2);
 
-               /* for A-MPDU Rx reordering buffer control */
-               for (i = 0; i < 16; i++) {
-                       preorder_ctrl = &psta->recvreorder_ctrl[i];
+       RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_info_,
+                ("alloc number_%d stainfo  with hwaddr = %pM\n",
+                 pstapriv->asoc_sta_count, hwaddr));
 
-                       preorder_ctrl->padapter = pstapriv->padapter;
+       init_addba_retry_timer(pstapriv->padapter, psta);
 
-                       preorder_ctrl->enable = false;
+       /* for A-MPDU Rx reordering buffer control */
+       for (i = 0; i < 16; i++) {
+               preorder_ctrl = &psta->recvreorder_ctrl[i];
 
-                       preorder_ctrl->indicate_seq = 0xffff;
-                       preorder_ctrl->wend_b = 0xffff;
-                       preorder_ctrl->wsize_b = 64;/* 64; */
+               preorder_ctrl->padapter = pstapriv->padapter;
 
-                       _rtw_init_queue(&preorder_ctrl->pending_recvframe_queue);
+               preorder_ctrl->enable = false;
 
-                       rtw_init_recv_timer(preorder_ctrl);
-               }
+               preorder_ctrl->indicate_seq = 0xffff;
+               preorder_ctrl->wend_b = 0xffff;
+               preorder_ctrl->wsize_b = 64;/* 64; */
 
-               /* init for DM */
-               psta->rssi_stat.UndecoratedSmoothedPWDB = -1;
-               psta->rssi_stat.UndecoratedSmoothedCCK = -1;
+               _rtw_init_queue(&preorder_ctrl->pending_recvframe_queue);
 
-               /* init for the sequence number of received management frame */
-               psta->RxMgmtFrameSeqNum = 0xffff;
+               rtw_init_recv_timer(preorder_ctrl);
        }
 
+       /* init for DM */
+       psta->rssi_stat.UndecoratedSmoothedPWDB = -1;
+       psta->rssi_stat.UndecoratedSmoothedCCK = -1;
+
+       /* init for the sequence number of received management frame */
+       psta->RxMgmtFrameSeqNum = 0xffff;
+
 exit:
        return psta;
 }