staging: vt6656: rf.c/h rename RFbRawSetPower to vnt_rf_set_txpower

Remove raw and use txpower.

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 5ad0a984eeb8a3d0161cba8bda8b2ec8da3e464e..d662e5431daddc66629b951a64de5eb312dc32af 100644 (file)
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -99,15 +99,15 @@ void CARDbSetMediaChannel(struct vnt_private *priv, u32 connection_channel)
 
        if (priv->byBBType == BB_TYPE_11A) {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyOFDMAPwrTbl[connection_channel-15], RATE_54M);
        } else if (priv->byBBType == BB_TYPE_11G) {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyOFDMPwrTbl[connection_channel-1], RATE_54M);
        } else {
                priv->byCurPwr = 0xff;
-               RFbRawSetPower(priv,
+               vnt_rf_set_txpower(priv,
                        priv->abyCCKPwrTbl[connection_channel-1], RATE_1M);
        }
 

diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c
index c1e0a795c3984337bf9ca4359f957dc25f19a202..fd699609b242461d100e2b252366733a5bac18bd 100644 (file)
--- a/drivers/staging/vt6656/rf.c
+++ b/drivers/staging/vt6656/rf.c
@@ -763,7 +763,7 @@ int vnt_rf_setpower(struct vnt_private *priv, u32 rate, u32 channel)
                break;
        }
 
-       ret = RFbRawSetPower(priv, power, rate);
+       ret = vnt_rf_set_txpower(priv, power, rate);
 
        return ret;
 }
@@ -808,7 +808,7 @@ static u8 vnt_rf_addpower(struct vnt_private *priv)
  *
  */
 
-int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
+int vnt_rf_set_txpower(struct vnt_private *priv, u8 power, u32 rate)
 {
        u32 power_setting = 0;
        int ret = true;
@@ -903,14 +903,14 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
 
                        if (priv->vnt_mgmt.eScanState != WMAC_NO_SCANNING) {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-                               "RFbRawSetPower> 11B mode uCurrChannel[%d]\n",
+                               "vnt_rf_set_txpower> 11B mode uCurrChannel[%d]\n",
                                                priv->vnt_mgmt.uScanChannel);
                                ret &= vnt_rf_write_embedded(priv,
                                        vt3226d0_lo_current_table[priv->
                                                vnt_mgmt.uScanChannel - 1]);
                        } else {
                                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-                               "RFbRawSetPower> 11B mode uCurrChannel[%d]\n",
+                               "vnt_rf_set_txpower> 11B mode uCurrChannel[%d]\n",
                                                priv->vnt_mgmt.uCurrChannel);
                                ret &= vnt_rf_write_embedded(priv,
                                        vt3226d0_lo_current_table[priv->
@@ -921,7 +921,7 @@ int RFbRawSetPower(struct vnt_private *priv, u8 power, u32 rate)
                                (BY_VT3226_REG_LEN<<3)+IFREGCTL_REGW);
                } else {
                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
-                                       "@@@@ RFbRawSetPower> 11G mode\n");
+                                       "@@@@ vnt_rf_set_txpower> 11G mode\n");
 
                        power_setting = ((0x3f-priv->byCurPwr) << 20) |
                                (0x7 << 8) | (BY_VT3226_REG_LEN << 3) |

diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h
index e47b67d23f465c06dac74011dbd074ccadf0708e..2040d5074a9a9b8499a7585e24928e72315851b6 100644 (file)
--- a/drivers/staging/vt6656/rf.h
+++ b/drivers/staging/vt6656/rf.h
@@ -59,7 +59,7 @@ extern const u8 RFaby11aChannelIndex[200];
 
 int vnt_rf_write_embedded(struct vnt_private *, u32);
 int vnt_rf_setpower(struct vnt_private *, u32, u32);
-int RFbRawSetPower(struct vnt_private *, u8 byPwr, u32 uRATE);
+int vnt_rf_set_txpower(struct vnt_private *, u8, u32);
 void RFvRSSITodBm(struct vnt_private *, u8 byCurrRSSI, long *pldBm);
 void RFbRFTableDownload(struct vnt_private *pDevice);