From: Malcolm Priestley Date: Fri, 30 May 2014 22:22:49 +0000 (+0100) Subject: staging: vt6656: rename CARDqGetNextTBTT to vnt_get_next_tbtt X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75ef1b5195311993d148ca98e061f08f9f573d6d;p=linux-beck.git staging: vt6656: rename CARDqGetNextTBTT to vnt_get_next_tbtt Drop card and rename to vnt_get_next_tbtt Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index fdc7cd52112f..ee013a30d372 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -30,7 +30,7 @@ * CARDbSoftwareReset - Sortware reset NIC * vnt_get_tsf_offset - Calculate TSFOffset * vnt_get_current_tsf - Read Current NIC TSF counter - * CARDqGetNextTBTT - Calculate Next Beacon TSF counter + * vnt_get_next_tbtt - Calculate Next Beacon TSF counter * CARDvSetFirstNextTBTT - Set NIC Beacon time * CARDvUpdateNextTBTT - Sync. NIC Beacon time * CARDbRadioPowerOff - Turn Off NIC Radio Power @@ -657,7 +657,7 @@ bool vnt_clear_current_tsf(struct vnt_private *priv) * Return Value: TSF value of next Beacon * */ -u64 CARDqGetNextTBTT(u64 tsf, u16 beacon_interval) +u64 vnt_get_next_tbtt(u64 tsf, u16 beacon_interval) { u32 beacon_int; @@ -696,7 +696,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv, u16 beacon_interval) vnt_clear_current_tsf(priv); - next_tbtt = CARDqGetNextTBTT(next_tbtt, beacon_interval); + next_tbtt = vnt_get_next_tbtt(next_tbtt, beacon_interval); data[0] = (u8)next_tbtt; data[1] = (u8)(next_tbtt >> 8); @@ -733,7 +733,7 @@ void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 tsf, { u8 data[8]; - tsf = CARDqGetNextTBTT(tsf, beacon_interval); + tsf = vnt_get_next_tbtt(tsf, beacon_interval); data[0] = (u8)tsf; data[1] = (u8)(tsf >> 8); diff --git a/drivers/staging/vt6656/card.h b/drivers/staging/vt6656/card.h index 78ff81078d4c..d39a0a51fcf5 100644 --- a/drivers/staging/vt6656/card.h +++ b/drivers/staging/vt6656/card.h @@ -57,7 +57,7 @@ bool vnt_clear_current_tsf(struct vnt_private *); void CARDvSetFirstNextTBTT(struct vnt_private *pDevice, u16 wBeaconInterval); void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF, u16 wBeaconInterval); -u64 CARDqGetNextTBTT(u64 qwTSF, u16 wBeaconInterval); +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 CARDbRadioPowerOn(struct vnt_private *pDevice);