staging: vt6656: rename CARDbRadioPowerOff to vnt_radio_power_off

Drop card and rename to vnt_radio_power_off

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 9ecf189021d570576cf192159c22d3ce89de4430..e2ed0f458066f6c959390baa4462ff8770378676 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -33,7 +33,7 @@
  *      vnt_get_next_tbtt - Calculate Next Beacon TSF counter
  *      vnt_reset_next_tbtt - Set NIC Beacon time
  *      vnt_update_next_tbtt - Sync. NIC Beacon time
- *      CARDbRadioPowerOff - Turn Off NIC Radio Power
+ *      vnt_radio_power_off - Turn Off NIC Radio Power
  *      CARDbRadioPowerOn - Turn On NIC Radio Power
  *      CARDbSetWEPMode - Set NIC Wep mode
  *      CARDbSetTxPower - Set NIC tx power
@@ -764,7 +764,7 @@ void vnt_update_next_tbtt(struct vnt_private *priv, u64 tsf,
  * Return Value: true if success; otherwise false
  *
  */
-int CARDbRadioPowerOff(struct vnt_private *priv)
+int vnt_radio_power_off(struct vnt_private *priv)
 {
        int ret = true;
 

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index d5f7c68c835d69386b26252161bef694d0e9587a..614e6d6f0b2776564fed633114c87b1677c63a5a 100644 (file)
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -58,7 +58,7 @@ void vnt_reset_next_tbtt(struct vnt_private *, u16);
 void vnt_update_next_tbtt(struct vnt_private *, u64, u16);
 u64 vnt_get_next_tbtt(u64, u16);
 u64 vnt_get_tsf_offset(u8 byRxRate, u64 qwTSF1, u64 qwTSF2);
-int CARDbRadioPowerOff(struct vnt_private *pDevice);
+int vnt_radio_power_off(struct vnt_private *);
 int CARDbRadioPowerOn(struct vnt_private *pDevice);
 u8 vnt_get_pkt_type(struct vnt_private *);
 void CARDvSetBSSMode(struct vnt_private *pDevice);

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 636afc2fdb170088b15c41f5d638f2b60ba04d92..2378068a89083d1160e68005a0c7906aa18da43a 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -560,7 +560,7 @@ static int device_init_registers(struct vnt_private *pDevice)
 
        if ((pDevice->bHWRadioOff == true) ||
                                (pDevice->bRadioControlOff == true)) {
-               CARDbRadioPowerOff(pDevice);
+               vnt_radio_power_off(pDevice);
        } else {
                CARDbRadioPowerOn(pDevice);
        }

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index cec6fc6dc6b707c24563627e979dba8722cb21d6..d1d6cf28abf309d33b7a9322585821b49121158c 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -439,7 +439,7 @@ void vRunCommand(struct work_struct *work)
                }
                netif_stop_queue(pDevice->dev);
                if (pDevice->bNeedRadioOFF == true)
-                       CARDbRadioPowerOff(pDevice);
+                       vnt_radio_power_off(pDevice);
 
                break;
 
@@ -798,7 +798,7 @@ void vRunCommand(struct work_struct *work)
                                memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
 
                                netif_stop_queue(pDevice->dev);
-                               CARDbRadioPowerOff(pDevice);
+                               vnt_radio_power_off(pDevice);
                                MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
 
                                vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_OFF);