Skip to contentSkip to conversation

staging: vt6656: rf.c/h rename RFbSetPower

PATCH New Malcolm Priestley 1 participant 1 message Jun 3, 2013 Staging

lore
Share & tools
lore

Malcolm Priestley

author
#0 lore raw

PATCH 3/8 staging: vt6656: rf.c/h rename RFbSetPower

Remove camel case rename RFbSetPower to vnt_rf_setpower

Signed-off-by Malcolm Priestley <[email protected]>
---
 drivers/staging/vt6656/rf.c   |  2 +-
 drivers/staging/vt6656/rf.h   |  2 +-
 drivers/staging/vt6656/rxtx.c | 19 +++++++++----------
 drivers/staging/vt6656/wcmd.c |  8 ++++----
 4 files changed, 15 insertions(+), 16 deletions(-)
drivers/staging/vt6656/rf.c +1 -1
index 8c10886..7e6e386 100644
@@ -735,7 +735,7 @@ int vnt_rf_write_embedded(struct vnt_private *priv, u32 data)
  * Return Value: true if succeeded; false if failed.
  *
  */
-int RFbSetPower(struct vnt_private *priv, u32 rate, u32 channel)
+int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)
 {
 	int ret = true;
 	u8 power = priv->byCCKPwr;
drivers/staging/vt6656/rf.h +1 -1
index 9de28c0..62fcfc6 100644
@@ -56,7 +56,7 @@
 extern const u8 RFaby11aChannelIndex[200];
 
 int vnt_rf_write_embedded(struct vnt_private *, u32);
-int RFbSetPower(struct vnt_private *, u32 uRATE, u32 uCH);
+int vnt_rf_setpower(struct vnt_private *, u32, u32);
 int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE);
 void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm);
 void RFbRFTableDownload(struct vnt_private *pDevice);
drivers/staging/vt6656/rxtx.c +9 -10
index 9bf2f8d..d29d4b2 100644
@@ -1720,11 +1720,11 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice,
     // 2004.11.11 Kyle -- Using OFDM power to tx MngPkt will decrease the connection capability.
     //                    And cmd timer will wait data pkt TX finish before scanning so it's OK
     //                    to set power here.
-    if (pMgmt->eScanState != WMAC_NO_SCANNING) {
-        RFbSetPower(pDevice, wCurrentRate, pDevice->byCurrentCh);
-    } else {
-        RFbSetPower(pDevice, wCurrentRate, pMgmt->uCurrChannel);
-    }
+	if (pMgmt->eScanState != WMAC_NO_SCANNING)
+		vnt_rf_setpower(pDevice, wCurrentRate, pDevice->byCurrentCh);
+	else
+		vnt_rf_setpower(pDevice, wCurrentRate, pMgmt->uCurrChannel);
+
     pDevice->wCurrentRate = wCurrentRate;
 
     //Set packet type

@@ -2098,11 +2098,10 @@ void vDMA0_tx_80211(struct vnt_private *pDevice, struct sk_buff *skb)
     // 2004.11.11 Kyle -- Using OFDM power to tx MngPkt will decrease the connection capability.
     //                    And cmd timer will wait data pkt TX finish before scanning so it's OK
     //                    to set power here.
-    if (pMgmt->eScanState != WMAC_NO_SCANNING) {
-        RFbSetPower(pDevice, wCurrentRate, pDevice->byCurrentCh);
-    } else {
-        RFbSetPower(pDevice, wCurrentRate, pMgmt->uCurrChannel);
-    }
+	if (pMgmt->eScanState != WMAC_NO_SCANNING)
+		vnt_rf_setpower(pDevice, wCurrentRate, pDevice->byCurrentCh);
+	else
+		vnt_rf_setpower(pDevice, wCurrentRate, pMgmt->uCurrChannel);
 
     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"vDMA0_tx_80211: p80211Header->sA3.wFrameCtl = %x \n", p80211Header->sA3.wFrameCtl);
drivers/staging/vt6656/wcmd.c +4 -4
index 0013cb7..8cd45e3 100644
@@ -905,11 +905,11 @@ void vRunCommand(struct vnt_private *pDevice)
             break;
 
         case WLAN_CMD_SETPOWER_START:
+		vnt_rf_setpower(pDevice, pDevice->wCurrentRate,
+							pMgmt->uCurrChannel);
 
-            RFbSetPower(pDevice, pDevice->wCurrentRate, pMgmt->uCurrChannel);
-
-            s_bCommandComplete(pDevice);
-            break;
+		s_bCommandComplete(pDevice);
+		break;
 
         case WLAN_CMD_CHANGE_ANTENNA_START:
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change from Antenna%d to", (int)pDevice->dwRxAntennaSel);
Signature · 1 line
1.8.1.2