From: Malcolm Priestley Date: Tue, 27 May 2014 20:05:21 +0000 (+0100) Subject: staging: vt6656: rf.c/h rename RFbSetPower to vnt_rf_setpower X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~98 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4f5290ea3c2ad00cde2b5ec19c678c28cdc65597;p=firefly-linux-kernel-4.4.55.git staging: vt6656: rf.c/h rename RFbSetPower to vnt_rf_setpower Removing camel case Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/rf.c b/drivers/staging/vt6656/rf.c index b30a37315398..c1e0a795c398 100644 --- a/drivers/staging/vt6656/rf.c +++ b/drivers/staging/vt6656/rf.c @@ -734,7 +734,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; diff --git a/drivers/staging/vt6656/rf.h b/drivers/staging/vt6656/rf.h index 70d5b82ad0c0..e47b67d23f46 100644 --- a/drivers/staging/vt6656/rf.h +++ b/drivers/staging/vt6656/rf.h @@ -58,7 +58,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); diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index f11c2d3b22c2..704f4d3639be 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -1386,9 +1386,9 @@ CMD_STATUS csMgmt_xmit(struct vnt_private *pDevice, } if (pMgmt->eScanState != WMAC_NO_SCANNING) - RFbSetPower(pDevice, wCurrentRate, pDevice->byCurrentCh); + vnt_rf_setpower(pDevice, wCurrentRate, pDevice->byCurrentCh); else - RFbSetPower(pDevice, wCurrentRate, pMgmt->uCurrChannel); + vnt_rf_setpower(pDevice, wCurrentRate, pMgmt->uCurrChannel); pDevice->wCurrentRate = wCurrentRate; diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 9a166fbcfa1f..da72d4df6fca 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -835,7 +835,8 @@ void vRunCommand(struct work_struct *work) case WLAN_CMD_SETPOWER_START: - RFbSetPower(pDevice, pDevice->wCurrentRate, pMgmt->uCurrChannel); + vnt_rf_setpower(pDevice, pDevice->wCurrentRate, + pMgmt->uCurrChannel); break;