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

staging: rtl8712: rename bSurpriseRemoved to surprise_removed

- Rename structure field bSurprisedRemoved to surprised_removed to avoid
camelcase. Suggested by checkpatch.
- Change type to bool as the variable is used as a boolean.

Signed-off-by: Himadri Pandya <himadri18.07@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Himadri Pandya and committed by
Greg Kroah-Hartman
5b8d98f1 0ec6fc6f

+41 -42
+1 -1
drivers/staging/rtl8712/drv_types.h
··· 146 146 struct led_priv ledpriv; 147 147 struct mp_priv mppriv; 148 148 bool driver_stopped; 149 - s32 bSurpriseRemoved; 149 + bool surprise_removed; 150 150 s32 bSuspended; 151 151 u32 IsrContent; 152 152 u32 ImrContent;
+1 -1
drivers/staging/rtl8712/os_intfs.c
··· 375 375 mutex_lock(&padapter->mutex_start); 376 376 if (!padapter->bup) { 377 377 padapter->driver_stopped = false; 378 - padapter->bSurpriseRemoved = false; 378 + padapter->surprise_removed = false; 379 379 padapter->bup = true; 380 380 if (rtl871x_hal_init(padapter) != _SUCCESS) 381 381 goto netdev_open_error;
+2 -2
drivers/staging/rtl8712/rtl8712_cmd.c
··· 317 317 while (1) { 318 318 if (wait_for_completion_interruptible(cmd_queue_comp)) 319 319 break; 320 - if (padapter->driver_stopped || padapter->bSurpriseRemoved) 320 + if (padapter->driver_stopped || padapter->surprise_removed) 321 321 break; 322 322 if (r8712_register_cmd_alive(padapter) != _SUCCESS) 323 323 continue; ··· 369 369 memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz); 370 370 while (check_cmd_fifo(padapter, wr_sz) == _FAIL) { 371 371 if (padapter->driver_stopped || 372 - padapter->bSurpriseRemoved) 372 + padapter->surprise_removed) 373 373 break; 374 374 msleep(100); 375 375 continue;
+2 -2
drivers/staging/rtl8712/rtl8712_io.c
··· 68 68 { 69 69 struct intf_hdl *hdl = &adapter->pio_queue->intf; 70 70 71 - if (adapter->driver_stopped || adapter->bSurpriseRemoved) 71 + if (adapter->driver_stopped || adapter->surprise_removed) 72 72 return; 73 73 74 74 hdl->io_ops._read_mem(hdl, addr, cnt, pmem); ··· 85 85 { 86 86 struct intf_hdl *hdl = &adapter->pio_queue->intf; 87 87 88 - if (adapter->driver_stopped || adapter->bSurpriseRemoved) 88 + if (adapter->driver_stopped || adapter->surprise_removed) 89 89 return; 90 90 91 91 hdl->io_ops._read_port(hdl, addr, cnt, pmem);
+3 -3
drivers/staging/rtl8712/rtl8712_led.c
··· 109 109 { 110 110 u8 LedCfg; 111 111 112 - if (padapter->bSurpriseRemoved || padapter->driver_stopped) 112 + if (padapter->surprise_removed || padapter->driver_stopped) 113 113 return; 114 114 LedCfg = r8712_read8(padapter, LEDCFG); 115 115 switch (pLed->LedPin) { ··· 137 137 { 138 138 u8 LedCfg; 139 139 140 - if (padapter->bSurpriseRemoved || padapter->driver_stopped) 140 + if (padapter->surprise_removed || padapter->driver_stopped) 141 141 return; 142 142 LedCfg = r8712_read8(padapter, LEDCFG); 143 143 switch (pLed->LedPin) { ··· 816 816 /* This fixed the crash problem on Fedora 12 when trying to do the 817 817 * insmod;ifconfig up;rmmod commands. 818 818 */ 819 - if (pLed->padapter->bSurpriseRemoved || pLed->padapter->driver_stopped) 819 + if (pLed->padapter->surprise_removed || pLed->padapter->driver_stopped) 820 820 return; 821 821 schedule_work(&pLed->BlinkWorkItem); 822 822 }
+5 -5
drivers/staging/rtl8712/rtl8712_recv.c
··· 542 542 /*indicate this recv_frame*/ 543 543 if (!pattrib->amsdu) { 544 544 if (!padapter->driver_stopped && 545 - !padapter->bSurpriseRemoved) { 545 + !padapter->surprise_removed) { 546 546 /* indicate this recv_frame */ 547 547 r8712_recv_indicatepkt(padapter, 548 548 prframe); ··· 577 577 r8712_wlanhdr_to_ethhdr(prframe); 578 578 if (pattrib->qos != 1) { 579 579 if (!padapter->driver_stopped && 580 - !padapter->bSurpriseRemoved) { 580 + !padapter->surprise_removed) { 581 581 r8712_recv_indicatepkt(padapter, prframe); 582 582 return _SUCCESS; 583 583 } else { ··· 626 626 struct __queue *ppending_recvframe_queue = 627 627 &preorder_ctrl->pending_recvframe_queue; 628 628 629 - if (padapter->driver_stopped || padapter->bSurpriseRemoved) 629 + if (padapter->driver_stopped || padapter->surprise_removed) 630 630 return; 631 631 spin_lock_irqsave(&ppending_recvframe_queue->lock, irql); 632 632 r8712_recv_indicatepkts_in_order(padapter, preorder_ctrl, true); ··· 644 644 if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { 645 645 /* including perform A-MPDU Rx Ordering Buffer Control*/ 646 646 if (!padapter->driver_stopped && 647 - !padapter->bSurpriseRemoved) 647 + !padapter->surprise_removed) 648 648 return _FAIL; 649 649 } 650 650 } else { /*B/G mode*/ 651 651 retval = r8712_wlanhdr_to_ethhdr(prframe); 652 652 if (retval != _SUCCESS) 653 653 return retval; 654 - if (!padapter->driver_stopped && !padapter->bSurpriseRemoved) { 654 + if (!padapter->driver_stopped && !padapter->surprise_removed) { 655 655 /* indicate this recv_frame */ 656 656 r8712_recv_indicatepkt(padapter, prframe); 657 657 } else {
+11 -12
drivers/staging/rtl8712/rtl871x_eeprom.c
··· 37 37 { 38 38 u16 x, mask; 39 39 40 - if (padapter->bSurpriseRemoved) 40 + if (padapter->surprise_removed) 41 41 goto out; 42 42 mask = 0x01 << (count - 1); 43 43 x = r8712_read8(padapter, EE_9346CR); ··· 46 46 x &= ~_EEDI; 47 47 if (data & mask) 48 48 x |= _EEDI; 49 - if (padapter->bSurpriseRemoved) 49 + if (padapter->surprise_removed) 50 50 goto out; 51 51 r8712_write8(padapter, EE_9346CR, (u8)x); 52 52 udelay(CLOCK_RATE); ··· 54 54 down_clk(padapter, &x); 55 55 mask >>= 1; 56 56 } while (mask); 57 - if (padapter->bSurpriseRemoved) 57 + if (padapter->surprise_removed) 58 58 goto out; 59 59 x &= ~_EEDI; 60 60 r8712_write8(padapter, EE_9346CR, (u8)x); ··· 65 65 { 66 66 u16 x, d = 0, i; 67 67 68 - if (padapter->bSurpriseRemoved) 68 + if (padapter->surprise_removed) 69 69 goto out; 70 70 x = r8712_read8(padapter, EE_9346CR); 71 71 x &= ~(_EEDO | _EEDI); ··· 73 73 for (i = 0; i < 16; i++) { 74 74 d <<= 1; 75 75 up_clk(padapter, &x); 76 - if (padapter->bSurpriseRemoved) 76 + if (padapter->surprise_removed) 77 77 goto out; 78 78 x = r8712_read8(padapter, EE_9346CR); 79 79 x &= ~(_EEDI); ··· 117 117 { 118 118 u16 x; 119 119 120 - if (padapter->bSurpriseRemoved) 120 + if (padapter->surprise_removed) 121 121 return; 122 122 x = r8712_read8(padapter, EE_9346CR); 123 - if (padapter->bSurpriseRemoved) 123 + if (padapter->surprise_removed) 124 124 return; 125 125 x &= ~(_EECS | _EEDI); 126 126 r8712_write8(padapter, EE_9346CR, (u8)x); 127 - if (padapter->bSurpriseRemoved) 127 + if (padapter->surprise_removed) 128 128 return; 129 129 up_clk(padapter, &x); 130 - if (padapter->bSurpriseRemoved) 130 + if (padapter->surprise_removed) 131 131 return; 132 132 down_clk(padapter, &x); 133 133 } ··· 194 194 tmp8_clk_new = tmp8_clk_ori | 0x20; 195 195 if (tmp8_clk_new != tmp8_clk_ori) 196 196 r8712_write8(padapter, 0x10250003, tmp8_clk_new); 197 - if (padapter->bSurpriseRemoved) 197 + if (padapter->surprise_removed) 198 198 goto out; 199 199 /* select EEPROM, reset bits, set _EECS */ 200 200 x = r8712_read8(padapter, EE_9346CR); 201 - if (padapter->bSurpriseRemoved) 201 + if (padapter->surprise_removed) 202 202 goto out; 203 203 x &= ~(_EEDI | _EEDO | _EESK | _EEM0); 204 204 x |= _EEM1 | _EECS; ··· 218 218 r8712_write8(padapter, 0x102502f1, tmp8_ori); 219 219 return data; 220 220 } 221 -
+3 -3
drivers/staging/rtl8712/rtl871x_mlme.c
··· 174 174 { 175 175 sint res; 176 176 177 - if (padapter->driver_stopped || padapter->bSurpriseRemoved || 177 + if (padapter->driver_stopped || padapter->surprise_removed || 178 178 !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { 179 179 res = false; 180 180 } else { ··· 1055 1055 unsigned long irqL; 1056 1056 struct mlme_priv *pmlmepriv = &adapter->mlmepriv; 1057 1057 1058 - if (adapter->driver_stopped || adapter->bSurpriseRemoved) 1058 + if (adapter->driver_stopped || adapter->surprise_removed) 1059 1059 return; 1060 1060 spin_lock_irqsave(&pmlmepriv->lock, irqL); 1061 1061 _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING); ··· 1084 1084 1085 1085 void _r8712_dhcp_timeout_handler (struct _adapter *adapter) 1086 1086 { 1087 - if (adapter->driver_stopped || adapter->bSurpriseRemoved) 1087 + if (adapter->driver_stopped || adapter->surprise_removed) 1088 1088 return; 1089 1089 if (adapter->pwrctrlpriv.pwr_mode != adapter->registrypriv.power_mgnt) 1090 1090 r8712_set_ps_mode(adapter, adapter->registrypriv.power_mgnt,
+2 -2
drivers/staging/rtl8712/rtl871x_pwrctrl.c
··· 32 32 if (pwrpriv->rpwm_retry == 0) 33 33 return; 34 34 } 35 - if (padapter->driver_stopped || padapter->bSurpriseRemoved) 35 + if (padapter->driver_stopped || padapter->surprise_removed) 36 36 return; 37 37 rpwm = val8 | pwrpriv->tog; 38 38 switch (val8) { ··· 117 117 { 118 118 struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; 119 119 120 - if (padapter->driver_stopped || padapter->bSurpriseRemoved) 120 + if (padapter->driver_stopped || padapter->surprise_removed) 121 121 return; 122 122 if (pwrpriv->cpwm != pwrpriv->rpwm) 123 123 schedule_work(&pwrpriv->rpwm_workitem);
+3 -3
drivers/staging/rtl8712/usb_intf.c
··· 271 271 void rtl871x_intf_stop(struct _adapter *padapter) 272 272 { 273 273 /*disable_hw_interrupt*/ 274 - if (!padapter->bSurpriseRemoved) { 274 + if (!padapter->surprise_removed) { 275 275 /*device still exists, so driver can do i/o operation 276 276 * TODO: 277 277 */ ··· 298 298 r8712_stop_drv_threads(padapter); 299 299 300 300 /*s5.*/ 301 - if (!padapter->bSurpriseRemoved) { 301 + if (!padapter->surprise_removed) { 302 302 padapter->hw_init_completed = false; 303 303 rtl8712_hal_deinit(padapter); 304 304 } ··· 600 600 /* never exit with a firmware callback pending */ 601 601 wait_for_completion(&padapter->rtl8712_fw_ready); 602 602 if (drvpriv.drv_registered) 603 - padapter->bSurpriseRemoved = true; 603 + padapter->surprise_removed = true; 604 604 unregister_netdev(pnetdev); /* will call netdev_close() */ 605 605 flush_scheduled_work(); 606 606 udelay(1);
+8 -8
drivers/staging/rtl8712/usb_ops_linux.c
··· 149 149 if (purb->status == (-ESHUTDOWN)) 150 150 padapter->driver_stopped = true; 151 151 else 152 - padapter->bSurpriseRemoved = true; 152 + padapter->surprise_removed = true; 153 153 } 154 154 complete(&pintfpriv->io_retevt_comp); 155 155 } ··· 164 164 struct usb_device *pusbd = pdvobj->pusbdev; 165 165 struct urb *piorw_urb = pintfpriv->piorw_urb; 166 166 167 - if ((padapter->driver_stopped) || (padapter->bSurpriseRemoved) || 167 + if ((padapter->driver_stopped) || (padapter->surprise_removed) || 168 168 (padapter->pwrctrlpriv.pnp_bstop_trx)) 169 169 return; 170 170 /* translate DMA FIFO addr to pipehandle */ ··· 186 186 struct _adapter *padapter = (struct _adapter *)precvbuf->adapter; 187 187 struct recv_priv *precvpriv = &padapter->recvpriv; 188 188 189 - if (padapter->bSurpriseRemoved || padapter->driver_stopped) 189 + if (padapter->surprise_removed || padapter->driver_stopped) 190 190 return; 191 191 if (purb->status == 0) { /* SUCCESS */ 192 192 if ((purb->actual_length > (MAX_RECVBUF_SZ)) || ··· 254 254 struct recv_priv *precvpriv = &adapter->recvpriv; 255 255 struct usb_device *pusbd = pdvobj->pusbdev; 256 256 257 - if (adapter->driver_stopped || adapter->bSurpriseRemoved || 257 + if (adapter->driver_stopped || adapter->surprise_removed || 258 258 adapter->pwrctrlpriv.pnp_bstop_trx || !precvbuf) 259 259 return _FAIL; 260 260 r8712_init_recvbuf(adapter, precvbuf); ··· 315 315 struct xmit_priv *pxmitpriv = &padapter->xmitpriv; 316 316 317 317 if (padapter->driver_stopped || 318 - padapter->bSurpriseRemoved) { 319 - netdev_err(padapter->pnetdev, "xmit_bh => driver_stopped or bSurpriseRemoved\n"); 318 + padapter->surprise_removed) { 319 + netdev_err(padapter->pnetdev, "xmit_bh => driver_stopped or surprise_removed\n"); 320 320 return; 321 321 } 322 322 ret = r8712_xmitframe_complete(padapter, pxmitpriv, NULL); ··· 360 360 break; 361 361 } 362 362 } 363 - if (padapter->bSurpriseRemoved) 363 + if (padapter->surprise_removed) 364 364 return; 365 365 switch (purb->status) { 366 366 case 0: ··· 390 390 struct usb_device *pusbd = pdvobj->pusbdev; 391 391 struct pkt_attrib *pattrib = &pxmitframe->attrib; 392 392 393 - if ((padapter->driver_stopped) || (padapter->bSurpriseRemoved) || 393 + if ((padapter->driver_stopped) || (padapter->surprise_removed) || 394 394 (padapter->pwrctrlpriv.pnp_bstop_trx)) 395 395 return _FAIL; 396 396 for (i = 0; i < 8; i++) {