staging: vt6656: rename CARDbRadioPowerOn to vnt_radio_power_on

Drop card and rename to vnt_radio_power_on

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 e2ed0f458066f6c959390baa4462ff8770378676..366d7d5b37b9bd63e78172b61ca3c2252996e9a2 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -34,7 +34,7 @@
  *      vnt_reset_next_tbtt - Set NIC Beacon time
  *      vnt_update_next_tbtt - Sync. NIC Beacon time
  *      vnt_radio_power_off - Turn Off NIC Radio Power
- *      CARDbRadioPowerOn - Turn On NIC Radio Power
+ *      vnt_radio_power_on - Turn On NIC Radio Power
  *      CARDbSetWEPMode - Set NIC Wep mode
  *      CARDbSetTxPower - Set NIC tx power
  *
@@ -801,7 +801,7 @@ int vnt_radio_power_off(struct vnt_private *priv)
  * Return Value: true if success; otherwise false
  *
  */
-int CARDbRadioPowerOn(struct vnt_private *priv)
+int vnt_radio_power_on(struct vnt_private *priv)
 {
        int ret = true;
 

diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h
index 614e6d6f0b2776564fed633114c87b1677c63a5a..150f870a236282a0021f573232a67e43932240d3 100644 (file)
--- a/drivers/staging/vt6656/card.h
+++ b/drivers/staging/vt6656/card.h
@@ -59,7 +59,7 @@ 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 vnt_radio_power_off(struct vnt_private *);
-int CARDbRadioPowerOn(struct vnt_private *pDevice);
+int vnt_radio_power_on(struct vnt_private *);
 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 2378068a89083d1160e68005a0c7906aa18da43a..09da861263c3249aeb781027d83ad94364fca125 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -562,7 +562,7 @@ static int device_init_registers(struct vnt_private *pDevice)
                                (pDevice->bRadioControlOff == true)) {
                vnt_radio_power_off(pDevice);
        } else {
-               CARDbRadioPowerOn(pDevice);
+               vnt_radio_power_on(pDevice);
        }
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"<----INIbInitAdapter Exit\n");

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index d1d6cf28abf309d33b7a9322585821b49121158c..191e7887198fecbedbca9f1eaff8925251382319 100644 (file)
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -807,7 +807,7 @@ void vRunCommand(struct work_struct *work)
                        } else {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_ON........................\n");
                                pDevice->bHWRadioOff = false;
-                               CARDbRadioPowerOn(pDevice);
+                               vnt_radio_power_on(pDevice);
                                MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
 
                                vnt_mac_set_led(pDevice, LEDSTS_STS, LEDSTS_ON);