leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: vt6655: Replace unused return value of vt6655_get_current_tsf

Browse Source 
Replace unused return value with u64 to increase readability,
reduce address and dereference operators and omit pqwCurrTSF that
uses CamelCase which is not accepted by checkpatch.pl

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/62c83d78627196ec0ce2f5a562cb080a1c87a05a.1651435890.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Philipp Hortmann 2022-05-01 22:25:41 +02:00 committed by Greg Kroah-Hartman
parent fed5b53385
commit 60a1698517
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/vt6655/card.c
View File

@ -288,7 +288,7 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
u64 local_tsf; u64 local_tsf;
u64 qwTSFOffset = 0; u64 qwTSFOffset = 0;
vt6655_get_current_tsf(priv, &local_tsf); local_tsf = vt6655_get_current_tsf(priv);
if (qwBSSTimestamp != local_tsf) { if (qwBSSTimestamp != local_tsf) {
qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp, qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
@ -320,9 +320,9 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
bool CARDbSetBeaconPeriod(struct vnt_private *priv, bool CARDbSetBeaconPeriod(struct vnt_private *priv,
unsigned short wBeaconInterval) unsigned short wBeaconInterval)
{ {
u64 qwNextTBTT = 0; u64 qwNextTBTT;
vt6655_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */ qwNextTBTT = vt6655_get_current_tsf(priv); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
@ -739,7 +739,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
* *
* Return Value: true if success; otherwise false * Return Value: true if success; otherwise false
*/ */
bool vt6655_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF) u64 vt6655_get_current_tsf(struct vnt_private *priv)
{ {
void __iomem *iobase = priv->port_offset; void __iomem *iobase = priv->port_offset;
unsigned short ww; unsigned short ww;
@ -753,12 +753,10 @@ bool vt6655_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
break; break;
} }
if (ww == W_MAX_TIMEOUT) if (ww == W_MAX_TIMEOUT)
return false; return 0;
low = ioread32(iobase + MAC_REG_TSFCNTR); low = ioread32(iobase + MAC_REG_TSFCNTR);
high = ioread32(iobase + MAC_REG_TSFCNTR + 4); high = ioread32(iobase + MAC_REG_TSFCNTR + 4);
*pqwCurrTSF = le64_to_cpu(low + ((u64)high << 32)); return le64_to_cpu(low + ((u64)high << 32));
return true;
} }
/* /*
@ -805,9 +803,9 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
unsigned short wBeaconInterval) unsigned short wBeaconInterval)
{ {
void __iomem *iobase = priv->port_offset; void __iomem *iobase = priv->port_offset;
u64 qwNextTBTT = 0; u64 qwNextTBTT;
vt6655_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */ qwNextTBTT = vt6655_get_current_tsf(priv); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval); qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
/* Set NextTBTT */ /* Set NextTBTT */

2
drivers/staging/vt6655/card.h
View File

@ -46,7 +46,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
unsigned short wBeaconInterval); unsigned short wBeaconInterval);
void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF, void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
unsigned short wBeaconInterval); unsigned short wBeaconInterval);
bool vt6655_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF); u64 vt6655_get_current_tsf(struct vnt_private *priv);
u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval); u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval);
u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2); u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2);
unsigned char CARDbyGetPktType(struct vnt_private *priv); unsigned char CARDbyGetPktType(struct vnt_private *priv);

2
drivers/staging/vt6655/device_main.c
View File

@ -1603,7 +1603,7 @@ static u64 vnt_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
struct vnt_private *priv = hw->priv; struct vnt_private *priv = hw->priv;
u64 tsf; u64 tsf;
vt6655_get_current_tsf(priv, &tsf); tsf = vt6655_get_current_tsf(priv);
return tsf; return tsf;
} }