Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: rtl8712: Delete explicit comparison with false and NULL

This patch delete explicit comparison to false and NULL in files of
rtl8712.

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Tapasweni Pathak and committed by
Greg Kroah-Hartman
366ba427 14ad732c

+21 -23
+1 -1
drivers/staging/rtl8712/recv_linux.c
··· 146 146 dev_kfree_skb_any(precvbuf->pskb); 147 147 precvbuf->pskb = NULL; 148 148 precvbuf->reuse = false; 149 - if (precvbuf->irp_pending == false) 149 + if (!precvbuf->irp_pending) 150 150 r8712_read_port(padapter, precvpriv->ff_hwaddr, 0, 151 151 (unsigned char *)precvbuf); 152 152 }
+1 -1
drivers/staging/rtl8712/rtl871x_io.c
··· 93 93 pintfhdl->intf_option = 0; 94 94 pintfhdl->adapter = dev; 95 95 pintfhdl->intf_dev = (u8 *)&(adapter->dvobjpriv); 96 - if (_init_intf_hdl(adapter, pintfhdl) == false) 96 + if (!_init_intf_hdl(adapter, pintfhdl)) 97 97 goto register_intf_hdl_fail; 98 98 return _SUCCESS; 99 99 register_intf_hdl_fail:
+9 -11
drivers/staging/rtl8712/rtl871x_ioctl_set.c
··· 77 77 /* when set_ssid/set_bssid for do_join(), but scanning queue 78 78 * is empty we try to issue sitesurvey firstly 79 79 */ 80 - if (pmlmepriv->sitesurveyctrl.traffic_busy == false) 80 + if (!pmlmepriv->sitesurveyctrl.traffic_busy) 81 81 r8712_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid); 82 82 return true; 83 83 } else { ··· 143 143 _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) { 144 144 if (!memcmp(&pmlmepriv->cur_network.network.MacAddress, bssid, 145 145 ETH_ALEN)) { 146 - if (check_fwstate(pmlmepriv, 147 - WIFI_STATION_STATE) == false) 146 + if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) 148 147 goto _Abort_Set_BSSID; /* driver is in 149 148 * WIFI_ADHOC_MASTER_STATE */ 150 149 } else { ··· 176 177 struct mlme_priv *pmlmepriv = &padapter->mlmepriv; 177 178 struct wlan_network *pnetwork = &pmlmepriv->cur_network; 178 179 179 - if (padapter->hw_init_completed == false) 180 + if (!padapter->hw_init_completed) 180 181 return; 181 182 spin_lock_irqsave(&pmlmepriv->lock, irqL); 182 183 if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) { ··· 187 188 if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && 188 189 (!memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, 189 190 ssid->SsidLength))) { 190 - if ((check_fwstate(pmlmepriv, 191 - WIFI_STATION_STATE) == false)) { 192 - if (r8712_is_same_ibss(padapter, 193 - pnetwork) == false) { 191 + if (!check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { 192 + if (!r8712_is_same_ibss(padapter, 193 + pnetwork)) { 194 194 /* if in WIFI_ADHOC_MASTER_STATE or 195 195 * WIFI_ADHOC_STATE, create bss or 196 196 * rejoin again ··· 225 227 } 226 228 if (padapter->securitypriv.btkip_countermeasure == true) 227 229 goto _Abort_Set_SSID; 228 - if (validate_ssid(ssid) == false) 230 + if (!validate_ssid(ssid)) 229 231 goto _Abort_Set_SSID; 230 232 memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(struct ndis_802_11_ssid)); 231 233 pmlmepriv->assoc_by_bssid = false; ··· 306 308 unsigned long irqL; 307 309 u8 ret = true; 308 310 309 - if (padapter == NULL) 311 + if (!padapter) 310 312 return false; 311 313 pmlmepriv = &padapter->mlmepriv; 312 - if (padapter->hw_init_completed == false) 314 + if (!padapter->hw_init_completed) 313 315 return false; 314 316 spin_lock_irqsave(&pmlmepriv->lock, irqL); 315 317 if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) ||
+2 -2
drivers/staging/rtl8712/rtl871x_mp.c
··· 56 56 pmp_priv->pallocated_mp_xmitframe_buf = kmalloc(NR_MP_XMITFRAME * 57 57 sizeof(struct mp_xmit_frame) + 4, 58 58 GFP_ATOMIC); 59 - if (pmp_priv->pallocated_mp_xmitframe_buf == NULL) { 59 + if (!pmp_priv->pallocated_mp_xmitframe_buf) { 60 60 res = _FAIL; 61 61 goto _exit_init_mp_priv; 62 62 } ··· 173 173 oldValue = r8712_bb_reg_read(pAdapter, iocmd.value); 174 174 oldValue &= (0xFFFFFFFF >> ((4 - shift) * 8)); 175 175 value = oldValue | (newValue << (shift * 8)); 176 - if (fw_iocmd_write(pAdapter, iocmd, value) == false) 176 + if (!fw_iocmd_write(pAdapter, iocmd, value)) 177 177 return false; 178 178 iocmd.value += 4; 179 179 oldValue = r8712_bb_reg_read(pAdapter, iocmd.value);
+5 -5
drivers/staging/rtl8712/usb_intf.c
··· 292 292 void rtl871x_intf_stop(struct _adapter *padapter) 293 293 { 294 294 /*disable_hw_interrupt*/ 295 - if (padapter->bSurpriseRemoved == false) { 295 + if (!padapter->bSurpriseRemoved) { 296 296 /*device still exists, so driver can do i/o operation 297 297 * TODO: */ 298 298 } 299 299 300 300 /* cancel in irp */ 301 - if (padapter->dvobjpriv.inirp_deinit != NULL) 301 + if (padapter->dvobjpriv.inirp_deinit) 302 302 padapter->dvobjpriv.inirp_deinit(padapter); 303 303 /* cancel out irp */ 304 304 r8712_usb_write_port_cancel(padapter); ··· 318 318 r8712_stop_drv_threads(padapter); 319 319 320 320 /*s5.*/ 321 - if (padapter->bSurpriseRemoved == false) { 321 + if (!padapter->bSurpriseRemoved) { 322 322 padapter->hw_init_completed = false; 323 323 rtl8712_hal_deinit(padapter); 324 324 } ··· 402 402 /* step 3. 403 403 * initialize the dvobj_priv 404 404 */ 405 - if (padapter->dvobj_init == NULL) 405 + if (!padapter->dvobj_init) 406 406 goto error; 407 407 else { 408 408 status = padapter->dvobj_init(padapter); ··· 568 568 ((mac[0] == 0x00) && (mac[1] == 0x00) && 569 569 (mac[2] == 0x00) && (mac[3] == 0x00) && 570 570 (mac[4] == 0x00) && (mac[5] == 0x00)) || 571 - (AutoloadFail == false)) { 571 + (!AutoloadFail)) { 572 572 mac[0] = 0x00; 573 573 mac[1] = 0xe0; 574 574 mac[2] = 0x4c;
+3 -3
drivers/staging/rtl8712/usb_ops_linux.c
··· 267 267 if (adapter->bDriverStopped || adapter->bSurpriseRemoved || 268 268 adapter->pwrctrlpriv.pnp_bstop_trx) 269 269 return _FAIL; 270 - if ((precvbuf->reuse == false) || (precvbuf->pskb == NULL)) { 270 + if (!precvbuf->reuse == false || !precvbuf->pskb) { 271 271 precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue); 272 272 if (NULL != precvbuf->pskb) 273 273 precvbuf->reuse = true; ··· 275 275 if (precvbuf != NULL) { 276 276 r8712_init_recvbuf(adapter, precvbuf); 277 277 /* re-assign for linux based on skb */ 278 - if ((precvbuf->reuse == false) || (precvbuf->pskb == NULL)) { 278 + if (!precvbuf->reuse || !precvbuf->pskb) { 279 279 precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, 280 280 MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); 281 - if (precvbuf->pskb == NULL) 281 + if (!precvbuf->pskb) 282 282 return _FAIL; 283 283 tmpaddr = (addr_t)precvbuf->pskb->data; 284 284 alignment = tmpaddr & (RECVBUFF_ALIGN_SZ-1);