staging: rtl8723bs: remove unnecessary bracks after RT_TRACE deletion

Remove all unnecessary bracks in if blocks, after RT_TRACE macro
deletion

Suggested-by: Joe Perches <joe@perches.com>
Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/19fda6f0a2b381399623f5a5def39b07be0d995f.1617640221.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 9fdaefe6e183e06b936595ef4bdf787b53ba5f7f..4c94202ac209780c8799656d6f38c3e2bedfd0db 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -3937,9 +3937,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
                {
                        u32 usNavUpper = *((u32 *)val);
 
-                       if (usNavUpper > HAL_NAV_UPPER_UNIT_8723B * 0xFF) {
+                       if (usNavUpper > HAL_NAV_UPPER_UNIT_8723B * 0xFF)
                                break;
-                       }
 
                        usNavUpper = DIV_ROUND_UP(usNavUpper,
                                                  HAL_NAV_UPPER_UNIT_8723B);

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index c18587cc78a54b5303b856000848d71b7d623410..54f36ca2f810dade278b3ae48f14ff298880eb10 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -101,9 +101,8 @@ query_free_page:
        if (
                (padapter->bSurpriseRemoved) ||
                (padapter->bDriverStopped)
-       ) {
+       )
                goto free_xmitbuf;
-       }
 
        if (rtw_sdio_wait_enough_TxOQT_space(padapter, pxmitbuf->agg_num) == false)
                goto free_xmitbuf;
@@ -145,9 +144,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
        }
 
        ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved);
-       if (ret) {
+       if (ret)
                return _FAIL;
-       }
 
        queue_pending = check_pending_xmitbuf(pxmitpriv);
 
@@ -406,9 +404,8 @@ next:
        if (
                (padapter->bDriverStopped) ||
                (padapter->bSurpriseRemoved)
-       ) {
+       )
                return _FAIL;
-       }
 
        spin_lock_bh(&pxmitpriv->lock);
        ret = rtw_txframes_pending(padapter);

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index faedeeffcead9830058d0f38b5e3f8030fab5f00..cec72abc983cfe2ebc15093a9302cd5a8fb16c02 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -56,9 +56,8 @@ u8 _InitPowerOn_8723BS(struct adapter *padapter)
 
        /*  only cmd52 can be used before power on(card enable) */
        ret = CardEnable(padapter);
-       if (!ret) {
+       if (!ret)
                return _FAIL;
-       }
 
        /*  Radio-Off Pin Trigger */
        value8 = rtw_read8(padapter, REG_GPIO_INTM + 1);
@@ -674,9 +673,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 /*     rtw_hal_disable_interrupt(padapter); */
 
        ret = _InitPowerOn_8723BS(padapter);
-       if (_FAIL == ret) {
+       if (_FAIL == ret)
                return _FAIL;
-       }
 
        rtw_write8(padapter, REG_EARLY_MODE_CONTROL, 0);
 
@@ -710,18 +708,16 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
 
 #if (HAL_MAC_ENABLE == 1)
        ret = PHY_MACConfig8723B(padapter);
-       if (ret != _SUCCESS) {
+       if (ret != _SUCCESS)
                return ret;
-       }
 #endif
        /*  */
        /* d. Initialize BB related configurations. */
        /*  */
 #if (HAL_BB_ENABLE == 1)
        ret = PHY_BBConfig8723B(padapter);
-       if (ret != _SUCCESS) {
+       if (ret != _SUCCESS)
                return ret;
-       }
 #endif
 
        /*  If RF is on, we need to init RF. Otherwise, skip the procedure. */
@@ -730,9 +726,8 @@ static u32 rtl8723bs_hal_init(struct adapter *padapter)
        {
 #if (HAL_RF_ENABLE == 1)
                ret = PHY_RFConfig8723B(padapter);
-               if (ret != _SUCCESS) {
+               if (ret != _SUCCESS)
                        return ret;
-               }
 #endif
        }
 

diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index acbb811ced5a6a0a3ec08f0360248f83998617a5..b1f02bb9f0a93f9669825f5782ce43d4ec81ba4c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -873,9 +873,8 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)
        /* 3 3. read data from rxfifo */
        readbuf = recvbuf->pskb->data;
        ret = sdio_read_port(&adapter->iopriv.intf, WLAN_RX0FF_DEVICE_ID, readsize, readbuf);
-       if (ret == _FAIL) {
+       if (ret == _FAIL)
                return NULL;
-       }
 
        /* 3 4. init recvbuf */
        recvbuf->len = size;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 5b3976216d71f0bdb0043ae08115cb7c8c696b41..03360af0645dd7a3ede2724185f908e462a11f5d 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -439,9 +439,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
                        wep_key_len = wep_key_len <= 5 ? 5 : 13;
                        wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
                        pwep = kzalloc(wep_total_len, GFP_KERNEL);
-                       if (pwep == NULL) {
+                       if (pwep == NULL)
                                goto exit;
-                       }
 
                        pwep->KeyLength = wep_key_len;
                        pwep->Length = wep_total_len;
@@ -1488,9 +1487,8 @@ static int rtw_wx_set_essid(struct net_device *dev,
                pmlmepriv->pscanned = get_next(phead);
 
                while (1) {
-                       if (phead == pmlmepriv->pscanned) {
+                       if (phead == pmlmepriv->pscanned)
                                break;
-                       }
 
                        pnetwork = container_of(pmlmepriv->pscanned, struct wlan_network, list);
 
@@ -1635,9 +1633,9 @@ set_rate:
                }
        }
 
-       if (rtw_setdatarate_cmd(padapter, datarates) != _SUCCESS) {
+       if (rtw_setdatarate_cmd(padapter, datarates) != _SUCCESS)
                ret = -1;
-       }
+
        return ret;
 }
 

diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 26b77e42c0208f6d6a691f4e23deca407983d23f..fd6309b0bf87a1f61aea646349a3533c65cf077c 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -869,9 +869,8 @@ static int _netdev_open(struct net_device *pnetdev)
                padapter->bCardDisableWOHSM = false;
 
                status = rtw_hal_init(padapter);
-               if (status == _FAIL) {
+               if (status == _FAIL)
                        goto netdev_open_error;
-               }
 
                DBG_871X("MAC Address = %pM\n", MAC_ARG(pnetdev->dev_addr));
 
@@ -948,9 +947,8 @@ static int  ips_netdrv_open(struct adapter *padapter)
        /* padapter->bup = true; */
 
        status = rtw_hal_init(padapter);
-       if (status == _FAIL) {
+       if (status == _FAIL)
                goto netdev_open_error;
-       }
 
        if (padapter->intf_start)
                padapter->intf_start(padapter);

diff --git a/drivers/staging/rtl8723bs/os_dep/osdep_service.c b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
index 7b2aad346d20333f0f8963b4c524bb8970873537..5e4200d6b00f1f15da44c2769f36050477841d1b 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/osdep_service.c
+++ b/drivers/staging/rtl8723bs/os_dep/osdep_service.c
@@ -160,9 +160,8 @@ int rtw_change_ifname(struct adapter *padapter, const char *ifname)
        else
                ret = register_netdevice(pnetdev);
 
-       if (ret != 0) {
+       if (ret != 0)
                goto error;
-       }
 
        return 0;
 

diff --git a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
index a2a28803c8d99ecc2da871e878808292cb47bf83..63a7e7fe2bb58cf5ad06a89eddf7b13f2dda8205 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
@@ -201,9 +201,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
        pfree_recv_queue = &(precvpriv->free_recv_queue);
 
        skb = precv_frame->u.hdr.pkt;
-       if (skb == NULL) {
+       if (skb == NULL)
                goto _recv_indicatepkt_drop;
-       }
 
        skb->data = precv_frame->u.hdr.rx_data;
 

diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 5da4d271b5eed7695e5099ee8eb45ffbea0ae262..f8e1d15f54ef9f734bd835f24de3a9bb11d4c222 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -197,9 +197,9 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_func *func)
        psdio = &dvobj->intf_data;
        psdio->func = func;
 
-       if (sdio_init(dvobj) != _SUCCESS) {
+       if (sdio_init(dvobj) != _SUCCESS)
                goto free_dvobj;
-       }
+
        rtw_reset_continual_io_error(dvobj);
        status = _SUCCESS;
 
@@ -301,9 +301,8 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
        padapter->intf_alloc_irq = &sdio_alloc_irq;
        padapter->intf_free_irq = &sdio_free_irq;
 
-       if (rtw_init_io_priv(padapter, sdio_set_intf_ops) == _FAIL) {
+       if (rtw_init_io_priv(padapter, sdio_set_intf_ops) == _FAIL)
                goto free_hal_data;
-       }
 
        rtw_hal_read_chip_version(padapter);
 
@@ -315,9 +314,8 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj, const struct
        rtw_hal_read_chip_info(padapter);
 
        /* 3 7. init driver common data */
-       if (rtw_init_drv_sw(padapter) == _FAIL) {
+       if (rtw_init_drv_sw(padapter) == _FAIL)
                goto free_hal_data;
-       }
 
        rtw_wdev_alloc(padapter, dvobj_to_dev(dvobj));
 
@@ -397,9 +395,8 @@ static int rtw_drv_init(
        struct dvobj_priv *dvobj;
 
        dvobj = sdio_dvobj_init(func);
-       if (dvobj == NULL) {
+       if (dvobj == NULL)
                goto exit;
-       }
 
        if1 = rtw_sdio_if1_init(dvobj, id);
        if (if1 == NULL) {