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>

diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index e990118092c585e9b6cbe999f490c3c825643229..acee68d3d152b3de9a3fb4053f4e3602bf221543 100644 (file)
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -146,7 +146,7 @@ struct _adapter {
        struct  led_priv        ledpriv;
        struct mp_priv  mppriv;
        bool    driver_stopped;
-       s32     bSurpriseRemoved;
+       bool    surprise_removed;
        s32     bSuspended;
        u32     IsrContent;
        u32     ImrContent;

diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c
index bd2ffd0ebde94a9b0febf9bc4993925994e45175..41ba1eeea2f2a36133fdc731ba083c267dfceb36 100644 (file)
--- a/drivers/staging/rtl8712/os_intfs.c
+++ b/drivers/staging/rtl8712/os_intfs.c
@@ -375,7 +375,7 @@ static int netdev_open(struct net_device *pnetdev)
        mutex_lock(&padapter->mutex_start);
        if (!padapter->bup) {
                padapter->driver_stopped = false;
-               padapter->bSurpriseRemoved = false;
+               padapter->surprise_removed = false;
                padapter->bup = true;
                if (rtl871x_hal_init(padapter) != _SUCCESS)
                        goto netdev_open_error;

diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c
index c7437f97925259ffeef11b2c6362182a873ef912..1ffd984c25a497e81b9d8b870c983d72b1ac0cd9 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -317,7 +317,7 @@ int r8712_cmd_thread(void *context)
        while (1) {
                if (wait_for_completion_interruptible(cmd_queue_comp))
                        break;
-               if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+               if (padapter->driver_stopped || padapter->surprise_removed)
                        break;
                if (r8712_register_cmd_alive(padapter) != _SUCCESS)
                        continue;
@@ -369,7 +369,7 @@ _next:
                        memcpy((u8 *)pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
                        while (check_cmd_fifo(padapter, wr_sz) == _FAIL) {
                                if (padapter->driver_stopped ||
-                                   padapter->bSurpriseRemoved)
+                                   padapter->surprise_removed)
                                        break;
                                msleep(100);
                                continue;

diff --git a/drivers/staging/rtl8712/rtl8712_io.c b/drivers/staging/rtl8712/rtl8712_io.c
index ab775e721bf2e850f20c11a22cb916de83dba610..384cbdb05e1963015656cc83a1ffb6a1ae3927a7 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_io.c
+++ b/drivers/staging/rtl8712/rtl8712_io.c
@@ -68,7 +68,7 @@ void r8712_read_mem(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 {
        struct intf_hdl *hdl = &adapter->pio_queue->intf;
 
-       if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+       if (adapter->driver_stopped || adapter->surprise_removed)
                return;
 
        hdl->io_ops._read_mem(hdl, addr, cnt, pmem);
@@ -85,7 +85,7 @@ void r8712_read_port(struct _adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 {
        struct intf_hdl *hdl = &adapter->pio_queue->intf;
 
-       if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+       if (adapter->driver_stopped || adapter->surprise_removed)
                return;
 
        hdl->io_ops._read_port(hdl, addr, cnt, pmem);

diff --git a/drivers/staging/rtl8712/rtl8712_led.c b/drivers/staging/rtl8712/rtl8712_led.c
index deceef345056b3bf06e93fac82fc2e9969b0fb3d..a899a93dfcbb04d30fd7a8a578e4d9d6c083acbf 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_led.c
+++ b/drivers/staging/rtl8712/rtl8712_led.c
@@ -109,7 +109,7 @@ static void SwLedOn(struct _adapter *padapter, struct LED_871x *pLed)
 {
        u8      LedCfg;
 
-       if (padapter->bSurpriseRemoved || padapter->driver_stopped)
+       if (padapter->surprise_removed || padapter->driver_stopped)
                return;
        LedCfg = r8712_read8(padapter, LEDCFG);
        switch (pLed->LedPin) {
@@ -137,7 +137,7 @@ static void SwLedOff(struct _adapter *padapter, struct LED_871x *pLed)
 {
        u8      LedCfg;
 
-       if (padapter->bSurpriseRemoved || padapter->driver_stopped)
+       if (padapter->surprise_removed || padapter->driver_stopped)
                return;
        LedCfg = r8712_read8(padapter, LEDCFG);
        switch (pLed->LedPin) {
@@ -816,7 +816,7 @@ static void BlinkTimerCallback(struct timer_list *t)
        /* This fixed the crash problem on Fedora 12 when trying to do the
         * insmod;ifconfig up;rmmod commands.
         */
-       if (pLed->padapter->bSurpriseRemoved || pLed->padapter->driver_stopped)
+       if (pLed->padapter->surprise_removed || pLed->padapter->driver_stopped)
                return;
        schedule_work(&pLed->BlinkWorkItem);
 }

diff --git a/drivers/staging/rtl8712/rtl8712_recv.c b/drivers/staging/rtl8712/rtl8712_recv.c
index bca4edde18b4588d523edf58c5ed32c5181bcfea..9e0943185638a17a7ca4d30d395e5db08262864f 100644 (file)
--- a/drivers/staging/rtl8712/rtl8712_recv.c
+++ b/drivers/staging/rtl8712/rtl8712_recv.c
@@ -542,7 +542,7 @@ int r8712_recv_indicatepkts_in_order(struct _adapter *padapter,
                        /*indicate this recv_frame*/
                        if (!pattrib->amsdu) {
                                if (!padapter->driver_stopped &&
-                                   !padapter->bSurpriseRemoved) {
+                                   !padapter->surprise_removed) {
                                        /* indicate this recv_frame */
                                        r8712_recv_indicatepkt(padapter,
                                                               prframe);
@@ -577,7 +577,7 @@ static int recv_indicatepkt_reorder(struct _adapter *padapter,
                r8712_wlanhdr_to_ethhdr(prframe);
                if (pattrib->qos != 1) {
                        if (!padapter->driver_stopped &&
-                           !padapter->bSurpriseRemoved) {
+                           !padapter->surprise_removed) {
                                r8712_recv_indicatepkt(padapter, prframe);
                                return _SUCCESS;
                        } else {
@@ -626,7 +626,7 @@ void r8712_reordering_ctrl_timeout_handler(void *pcontext)
        struct  __queue *ppending_recvframe_queue =
                                 &preorder_ctrl->pending_recvframe_queue;
 
-       if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+       if (padapter->driver_stopped || padapter->surprise_removed)
                return;
        spin_lock_irqsave(&ppending_recvframe_queue->lock, irql);
        r8712_recv_indicatepkts_in_order(padapter, preorder_ctrl, true);
@@ -644,14 +644,14 @@ static int r8712_process_recv_indicatepkts(struct _adapter *padapter,
                if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) {
                        /* including perform A-MPDU Rx Ordering Buffer Control*/
                        if (!padapter->driver_stopped &&
-                           !padapter->bSurpriseRemoved)
+                           !padapter->surprise_removed)
                                return _FAIL;
                }
        } else { /*B/G mode*/
                retval = r8712_wlanhdr_to_ethhdr(prframe);
                if (retval != _SUCCESS)
                        return retval;
-               if (!padapter->driver_stopped && !padapter->bSurpriseRemoved) {
+               if (!padapter->driver_stopped && !padapter->surprise_removed) {
                        /* indicate this recv_frame */
                        r8712_recv_indicatepkt(padapter, prframe);
                } else {

diff --git a/drivers/staging/rtl8712/rtl871x_eeprom.c b/drivers/staging/rtl8712/rtl871x_eeprom.c
index 948bd0c757b56a57eaec0a8c32e41c50ab874b50..0027d8eb22fa720b133c427e9c493d08b8da13ba 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_eeprom.c
+++ b/drivers/staging/rtl8712/rtl871x_eeprom.c
@@ -37,7 +37,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
 {
        u16 x, mask;
 
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                goto out;
        mask = 0x01 << (count - 1);
        x = r8712_read8(padapter, EE_9346CR);
@@ -46,7 +46,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
                x &= ~_EEDI;
                if (data & mask)
                        x |= _EEDI;
-               if (padapter->bSurpriseRemoved)
+               if (padapter->surprise_removed)
                        goto out;
                r8712_write8(padapter, EE_9346CR, (u8)x);
                udelay(CLOCK_RATE);
@@ -54,7 +54,7 @@ static void shift_out_bits(struct _adapter *padapter, u16 data, u16 count)
                down_clk(padapter, &x);
                mask >>= 1;
        } while (mask);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                goto out;
        x &= ~_EEDI;
        r8712_write8(padapter, EE_9346CR, (u8)x);
@@ -65,7 +65,7 @@ static u16 shift_in_bits(struct _adapter *padapter)
 {
        u16 x, d = 0, i;
 
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                goto out;
        x = r8712_read8(padapter, EE_9346CR);
        x &= ~(_EEDO | _EEDI);
@@ -73,7 +73,7 @@ static u16 shift_in_bits(struct _adapter *padapter)
        for (i = 0; i < 16; i++) {
                d <<= 1;
                up_clk(padapter, &x);
-               if (padapter->bSurpriseRemoved)
+               if (padapter->surprise_removed)
                        goto out;
                x = r8712_read8(padapter, EE_9346CR);
                x &= ~(_EEDI);
@@ -117,17 +117,17 @@ static void eeprom_clean(struct _adapter *padapter)
 {
        u16 x;
 
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                return;
        x = r8712_read8(padapter, EE_9346CR);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                return;
        x &= ~(_EECS | _EEDI);
        r8712_write8(padapter, EE_9346CR, (u8)x);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                return;
        up_clk(padapter, &x);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                return;
        down_clk(padapter, &x);
 }
@@ -194,11 +194,11 @@ u16 r8712_eeprom_read16(struct _adapter *padapter, u16 reg) /*ReadEEprom*/
        tmp8_clk_new = tmp8_clk_ori | 0x20;
        if (tmp8_clk_new != tmp8_clk_ori)
                r8712_write8(padapter, 0x10250003, tmp8_clk_new);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                goto out;
        /* select EEPROM, reset bits, set _EECS */
        x = r8712_read8(padapter, EE_9346CR);
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                goto out;
        x &= ~(_EEDI | _EEDO | _EESK | _EEM0);
        x |= _EEM1 | _EECS;
@@ -218,4 +218,3 @@ out:
                r8712_write8(padapter, 0x102502f1, tmp8_ori);
        return data;
 }
-

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index a10a5fbabb335d6161cd89521fd60e982b0af533..c666e038f43e50130f579a83b82873d999dbd15e 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -174,7 +174,7 @@ sint r8712_if_up(struct _adapter *padapter)
 {
        sint res;
 
-       if (padapter->driver_stopped || padapter->bSurpriseRemoved ||
+       if (padapter->driver_stopped || padapter->surprise_removed ||
            !check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
                res = false;
        } else {
@@ -1055,7 +1055,7 @@ void _r8712_join_timeout_handler(struct _adapter *adapter)
        unsigned long irqL;
        struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
 
-       if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+       if (adapter->driver_stopped || adapter->surprise_removed)
                return;
        spin_lock_irqsave(&pmlmepriv->lock, irqL);
        _clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING);
@@ -1084,7 +1084,7 @@ void r8712_scan_timeout_handler (struct _adapter *adapter)
 
 void _r8712_dhcp_timeout_handler (struct _adapter *adapter)
 {
-       if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+       if (adapter->driver_stopped || adapter->surprise_removed)
                return;
        if (adapter->pwrctrlpriv.pwr_mode != adapter->registrypriv.power_mgnt)
                r8712_set_ps_mode(adapter, adapter->registrypriv.power_mgnt,

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index ab2be8507941b4eb88c19cec17390b76cca21417..2beafc7742b392868da4a53c4d0cfd1f7fc9553e 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -32,7 +32,7 @@ void r8712_set_rpwm(struct _adapter *padapter, u8 val8)
                if (pwrpriv->rpwm_retry == 0)
                        return;
        }
-       if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+       if (padapter->driver_stopped || padapter->surprise_removed)
                return;
        rpwm = val8 | pwrpriv->tog;
        switch (val8) {
@@ -117,7 +117,7 @@ static void _rpwm_check_handler (struct _adapter *padapter)
 {
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
 
-       if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+       if (padapter->driver_stopped || padapter->surprise_removed)
                return;
        if (pwrpriv->cpwm != pwrpriv->rpwm)
                schedule_work(&pwrpriv->rpwm_workitem);

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index cb66ed4bbeac118244a8789eac9a87293c1b3d6d..674c31155cddfe5d210b162b9897a0eff3ef1104 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -271,7 +271,7 @@ static void r8712_usb_dvobj_deinit(struct _adapter *padapter)
 void rtl871x_intf_stop(struct _adapter *padapter)
 {
        /*disable_hw_interrupt*/
-       if (!padapter->bSurpriseRemoved) {
+       if (!padapter->surprise_removed) {
                /*device still exists, so driver can do i/o operation
                 * TODO:
                 */
@@ -298,7 +298,7 @@ void r871x_dev_unload(struct _adapter *padapter)
                r8712_stop_drv_threads(padapter);
 
                /*s5.*/
-               if (!padapter->bSurpriseRemoved) {
+               if (!padapter->surprise_removed) {
                        padapter->hw_init_completed = false;
                        rtl8712_hal_deinit(padapter);
                }
@@ -600,7 +600,7 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
                /* never exit with a firmware callback pending */
                wait_for_completion(&padapter->rtl8712_fw_ready);
                if (drvpriv.drv_registered)
-                       padapter->bSurpriseRemoved = true;
+                       padapter->surprise_removed = true;
                unregister_netdev(pnetdev); /* will call netdev_close() */
                flush_scheduled_work();
                udelay(1);

diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c
index c4e66f19349ee15522990e3a201c34731b3d1a4f..8df308df35c6ca91a3e8d1cd840d49163bfabc8d 100644 (file)
--- a/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/drivers/staging/rtl8712/usb_ops_linux.c
@@ -149,7 +149,7 @@ static void usb_write_mem_complete(struct urb *purb)
                if (purb->status == (-ESHUTDOWN))
                        padapter->driver_stopped = true;
                else
-                       padapter->bSurpriseRemoved = true;
+                       padapter->surprise_removed = true;
        }
        complete(&pintfpriv->io_retevt_comp);
 }
@@ -164,7 +164,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
        struct usb_device *pusbd = pdvobj->pusbdev;
        struct urb *piorw_urb = pintfpriv->piorw_urb;
 
-       if ((padapter->driver_stopped) || (padapter->bSurpriseRemoved) ||
+       if ((padapter->driver_stopped) || (padapter->surprise_removed) ||
            (padapter->pwrctrlpriv.pnp_bstop_trx))
                return;
        /* translate DMA FIFO addr to pipehandle */
@@ -186,7 +186,7 @@ static void r8712_usb_read_port_complete(struct urb *purb)
        struct _adapter *padapter = (struct _adapter *)precvbuf->adapter;
        struct recv_priv *precvpriv = &padapter->recvpriv;
 
-       if (padapter->bSurpriseRemoved || padapter->driver_stopped)
+       if (padapter->surprise_removed || padapter->driver_stopped)
                return;
        if (purb->status == 0) { /* SUCCESS */
                if ((purb->actual_length > (MAX_RECVBUF_SZ)) ||
@@ -254,7 +254,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem)
        struct recv_priv *precvpriv = &adapter->recvpriv;
        struct usb_device *pusbd = pdvobj->pusbdev;
 
-       if (adapter->driver_stopped || adapter->bSurpriseRemoved ||
+       if (adapter->driver_stopped || adapter->surprise_removed ||
            adapter->pwrctrlpriv.pnp_bstop_trx || !precvbuf)
                return _FAIL;
        r8712_init_recvbuf(adapter, precvbuf);
@@ -315,8 +315,8 @@ void r8712_xmit_bh(void *priv)
        struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
 
        if (padapter->driver_stopped ||
-           padapter->bSurpriseRemoved) {
-               netdev_err(padapter->pnetdev, "xmit_bh => driver_stopped or bSurpriseRemoved\n");
+           padapter->surprise_removed) {
+               netdev_err(padapter->pnetdev, "xmit_bh => driver_stopped or surprise_removed\n");
                return;
        }
        ret = r8712_xmitframe_complete(padapter, pxmitpriv, NULL);
@@ -360,7 +360,7 @@ static void usb_write_port_complete(struct urb *purb)
                        break;
                }
        }
-       if (padapter->bSurpriseRemoved)
+       if (padapter->surprise_removed)
                return;
        switch (purb->status) {
        case 0:
@@ -390,7 +390,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
        struct usb_device *pusbd = pdvobj->pusbdev;
        struct pkt_attrib *pattrib = &pxmitframe->attrib;
 
-       if ((padapter->driver_stopped) || (padapter->bSurpriseRemoved) ||
+       if ((padapter->driver_stopped) || (padapter->surprise_removed) ||
            (padapter->pwrctrlpriv.pnp_bstop_trx))
                return _FAIL;
        for (i = 0; i < 8; i++) {