diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-04-24 09:44:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-04-26 11:37:00 +0200 |
| commit | f898a286d99485cdfcb34727f2974e33ea95cdcb (patch) | |
| tree | d1df9de413aeec122f94a9ed78a37acda8b68af8 /drivers | |
| parent | a7d1a806718083c8997fcc0320f03376709a4000 (diff) | |
staging: vt6655: Replace VNSvInPortW with ioread16
Replace macro VNSvInPortW with ioread16.
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/2d55e245cc530ffafe53384df03691d1b29b495c.1650784817.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6655/mac.h | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6655/upc.h | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index 7970a42ee6e6..4c6739862188 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -547,7 +547,7 @@ do { \ #define MACvWordRegBitsOn(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + wData = ioread16(iobase + byRegOfs); \ VNSvOutPortW(iobase + byRegOfs, wData | (wBits)); \ } while (0) @@ -561,7 +561,7 @@ do { \ #define MACvWordRegBitsOff(iobase, byRegOfs, wBits) \ do { \ unsigned short wData; \ - VNSvInPortW(iobase + byRegOfs, &wData); \ + wData = ioread16(iobase + byRegOfs); \ VNSvOutPortW(iobase + byRegOfs, wData & ~(wBits)); \ } while (0) diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index d2c1528c8e1b..4d09cf18ebe0 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -20,9 +20,6 @@ /* For memory mapped IO */ -#define VNSvInPortW(dwIOAddress, pwData) \ - (*(pwData) = ioread16(dwIOAddress)) - #define VNSvInPortD(dwIOAddress, pdwData) \ (*(pdwData) = ioread32(dwIOAddress)) |