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 <[email protected]>
---
Diffs for testing:
u64 qwNextTBTT;
qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
+ dev_info(&priv->pcid->dev, "CARDbSetBeaconPeriod 0x%016llx", qwNextTBTT);
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
/* set HW beacon interval */
@@ -810,7 +810,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
u64 qwNextTBTT;
qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
+ dev_info(&priv->pcid->dev, "CARDvSetFirstNextTBTT 0x%016llx", qwNextTBTT);
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
/* Set NextTBTT */
VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
Log:
vt6655 0000:01:05.0: CARDbSetBeaconPeriod 0x00 00 00 01 4a 89 52 c4
vt6655 0000:01:05.0: CARDvSetFirstNextTBTT 0x00 00 00 01 4a 89 52 dc
---
drivers/staging/vt6655/card.c | 20 +++++++++-----------
drivers/staging/vt6655/card.h | 2 +-
drivers/staging/vt6655/device_main.c | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index d1dfd96e13b7..50d70ebff83a 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -288,7 +288,7 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
u64 local_tsf;
u64 qwTSFOffset = 0;
- card_get_current_tsf(priv, &local_tsf);
+ local_tsf = card_get_current_tsf(priv);
if (qwBSSTimestamp != local_tsf) {
qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
@@ -320,9 +320,9 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
bool CARDbSetBeaconPeriod(struct vnt_private *priv,
unsigned short wBeaconInterval)
{
- u64 qwNextTBTT = 0;
+ u64 qwNextTBTT;
- card_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */
+ qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
@@ -739,7 +739,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
*
* Return Value: true if success; otherwise false
*/
-bool card_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
+u64 card_get_current_tsf(struct vnt_private *priv)
{
void __iomem *iobase = priv->port_offset;
unsigned short ww;
@@ -753,16 +753,14 @@ bool card_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
break;
}
if (ww == W_MAX_TIMEOUT)
- return false;
+ return 0;
low = ioread32(iobase + MAC_REG_TSFCNTR);
high = ioread32(iobase + MAC_REG_TSFCNTR + 4);
#ifdef __BIG_ENDIAN
- *pqwCurrTSF = high + ((u64)low << 32);
+ return high + ((u64)low << 32);
#else
- *pqwCurrTSF = low + ((u64)high << 32);
+ return low + ((u64)high << 32);
#endif
-
- return true;
}
/*
@@ -809,9 +807,9 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
unsigned short wBeaconInterval)
{
void __iomem *iobase = priv->port_offset;
- u64 qwNextTBTT = 0;
+ u64 qwNextTBTT;
- card_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */
+ qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
/* Set NextTBTT */
diff --git a/drivers/staging/vt6655/card.h b/drivers/staging/vt6655/card.h
index 55fe039065db..7830a055b855 100644
--- a/drivers/staging/vt6655/card.h
+++ b/drivers/staging/vt6655/card.h
@@ -46,7 +46,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
unsigned short wBeaconInterval);
void CARDvUpdateNextTBTT(struct vnt_private *priv, u64 qwTSF,
unsigned short wBeaconInterval);
-bool card_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF);
+u64 card_get_current_tsf(struct vnt_private *priv);
u64 CARDqGetNextTBTT(u64 qwTSF, unsigned short wBeaconInterval);
u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2);
unsigned char CARDbyGetPktType(struct vnt_private *priv);
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 393430757700..6989d8d04f2f 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1603,7 +1603,7 @@ static u64 vnt_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
struct vnt_private *priv = hw->priv;
u64 tsf;
- card_get_current_tsf(priv, &tsf);
+ tsf = card_get_current_tsf(priv);
return tsf;
}
--
2.25.1
On Sun, May 01, 2022 at 06:37:11PM +0200, Philipp Hortmann wrote:
> 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 <[email protected]>
> ---
> Diffs for testing:
> u64 qwNextTBTT;
>
> qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
> + dev_info(&priv->pcid->dev, "CARDbSetBeaconPeriod 0x%016llx", qwNextTBTT);
Don't put a diff in a diff please, git _should_ handle it, but I know
other tools that will choke on it.
> qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
>
> /* set HW beacon interval */
> @@ -810,7 +810,7 @@ void CARDvSetFirstNextTBTT(struct vnt_private *priv,
> u64 qwNextTBTT;
>
> qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
> + dev_info(&priv->pcid->dev, "CARDvSetFirstNextTBTT 0x%016llx", qwNextTBTT);
> qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
> /* Set NextTBTT */
> VNSvOutPortD(iobase + MAC_REG_NEXTTBTT, (u32)qwNextTBTT);
> Log:
> vt6655 0000:01:05.0: CARDbSetBeaconPeriod 0x00 00 00 01 4a 89 52 c4
> vt6655 0000:01:05.0: CARDvSetFirstNextTBTT 0x00 00 00 01 4a 89 52 dc
> ---
> drivers/staging/vt6655/card.c | 20 +++++++++-----------
> drivers/staging/vt6655/card.h | 2 +-
> drivers/staging/vt6655/device_main.c | 2 +-
> 3 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
> index d1dfd96e13b7..50d70ebff83a 100644
> --- a/drivers/staging/vt6655/card.c
> +++ b/drivers/staging/vt6655/card.c
> @@ -288,7 +288,7 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
> u64 local_tsf;
> u64 qwTSFOffset = 0;
>
> - card_get_current_tsf(priv, &local_tsf);
> + local_tsf = card_get_current_tsf(priv);
{sigh} I should read all patches in the series before complaining about
previous ones, sorry about that.
Looks much better, except for the function name.
>
> if (qwBSSTimestamp != local_tsf) {
> qwTSFOffset = CARDqGetTSFOffset(byRxRate, qwBSSTimestamp,
> @@ -320,9 +320,9 @@ bool CARDbUpdateTSF(struct vnt_private *priv, unsigned char byRxRate,
> bool CARDbSetBeaconPeriod(struct vnt_private *priv,
> unsigned short wBeaconInterval)
> {
> - u64 qwNextTBTT = 0;
> + u64 qwNextTBTT;
>
> - card_get_current_tsf(priv, &qwNextTBTT); /* Get Local TSF counter */
> + qwNextTBTT = card_get_current_tsf(priv); /* Get Local TSF counter */
>
> qwNextTBTT = CARDqGetNextTBTT(qwNextTBTT, wBeaconInterval);
>
> @@ -739,7 +739,7 @@ u64 CARDqGetTSFOffset(unsigned char byRxRate, u64 qwTSF1, u64 qwTSF2)
> *
> * Return Value: true if success; otherwise false
> */
> -bool card_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
> +u64 card_get_current_tsf(struct vnt_private *priv)
> {
> void __iomem *iobase = priv->port_offset;
> unsigned short ww;
> @@ -753,16 +753,14 @@ bool card_get_current_tsf(struct vnt_private *priv, u64 *pqwCurrTSF)
> break;
> }
> if (ww == W_MAX_TIMEOUT)
> - return false;
> + return 0;
> low = ioread32(iobase + MAC_REG_TSFCNTR);
> high = ioread32(iobase + MAC_REG_TSFCNTR + 4);
> #ifdef __BIG_ENDIAN
Note, this #ifdef really should never be in kernel code if you are doing
things properly. There are functions to handle this correctly...
Things get "fun" when you have devices in one endian running on busses
of other endian. Hopefully this driver never has to deal with that, but
for many others we do, so please stick with the normal functions to
handle this whenever possible.
thanks,
greg k-h