diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-05-01 21:12:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-05 23:21:01 +0200 |
| commit | 79ffde57deb8e3ca64cc4465bfa5d40dbb8e87e1 (patch) | |
| tree | 47a543e7d0fbb6a588a4eb6efaccf80bb10b0c87 /drivers/staging/vt6655/card.c | |
| parent | 72b901c1aaa3ba1f8bdd55625e689e48ad1f85e3 (diff) | |
| download | linux-stable-79ffde57deb8e3ca64cc4465bfa5d40dbb8e87e1.tar.gz linux-stable-79ffde57deb8e3ca64cc4465bfa5d40dbb8e87e1.tar.bz2 linux-stable-79ffde57deb8e3ca64cc4465bfa5d40dbb8e87e1.zip | |
staging: vt6655: Replace VNSvInPortD with ioread32
Replace macro VNSvInPortD with ioread32 and as it was
the only user, it can now be removed.
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/3945d32053898e5f9771d6f742ae118ca56943ce.1651431640.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655/card.c')
| -rw-r--r-- | drivers/staging/vt6655/card.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index 022310af5485..0dd13e475d6b 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -744,6 +744,7 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF) void __iomem *iobase = priv->port_offset; unsigned short ww; unsigned char data; + u32 low, high; MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { @@ -753,8 +754,9 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF) } if (ww == W_MAX_TIMEOUT) return false; - VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); - VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); + low = ioread32(iobase + MAC_REG_TSFCNTR); + high = ioread32(iobase + MAC_REG_TSFCNTR + 4); + *pqwCurrTSF = low + ((u64)high << 32); return true; } |