tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Philipp Hortmann and committed by
Greg Kroah-Hartman 79ffde57 72b901c1

+17 -18
+4 -2
drivers/staging/vt6655/card.c
··· 744 744 void __iomem *iobase = priv->port_offset; 745 745 unsigned short ww; 746 746 unsigned char data; 747 + u32 low, high; 747 748 748 749 MACvRegBitsOn(iobase, MAC_REG_TFTCTL, TFTCTL_TSFCNTRRD); 749 750 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { ··· 754 753 } 755 754 if (ww == W_MAX_TIMEOUT) 756 755 return false; 757 - VNSvInPortD(iobase + MAC_REG_TSFCNTR, (u32 *)pqwCurrTSF); 758 - VNSvInPortD(iobase + MAC_REG_TSFCNTR + 4, (u32 *)pqwCurrTSF + 1); 756 + low = ioread32(iobase + MAC_REG_TSFCNTR); 757 + high = ioread32(iobase + MAC_REG_TSFCNTR + 4); 758 + *pqwCurrTSF = low + ((u64)high << 32); 759 759 760 760 return true; 761 761 }
+3 -3
drivers/staging/vt6655/device_main.c
··· 1029 1029 u32 isr; 1030 1030 unsigned long flags; 1031 1031 1032 - VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); 1032 + isr = ioread32(priv->port_offset + MAC_REG_ISR); 1033 1033 1034 1034 if (isr == 0) 1035 1035 return; ··· 1042 1042 spin_lock_irqsave(&priv->lock, flags); 1043 1043 1044 1044 /* Read low level stats */ 1045 - VNSvInPortD(priv->port_offset + MAC_REG_MIBCNTR, &mib_counter); 1045 + mib_counter = ioread32(priv->port_offset + MAC_REG_MIBCNTR); 1046 1046 1047 1047 low_stats->dot11RTSSuccessCount += mib_counter & 0xff; 1048 1048 low_stats->dot11RTSFailureCount += (mib_counter >> 8) & 0xff; ··· 1116 1116 ieee80211_queue_stopped(priv->hw, 0)) 1117 1117 ieee80211_wake_queues(priv->hw); 1118 1118 1119 - VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr); 1119 + isr = ioread32(priv->port_offset + MAC_REG_ISR); 1120 1120 1121 1121 MACvReceive0(priv->port_offset); 1122 1122 MACvReceive1(priv->port_offset);
+9 -9
drivers/staging/vt6655/mac.h
··· 618 618 #define MACvReceive0(iobase) \ 619 619 do { \ 620 620 unsigned long dwData; \ 621 - VNSvInPortD(iobase + MAC_REG_RXDMACTL0, &dwData); \ 621 + dwData = ioread32(iobase + MAC_REG_RXDMACTL0); \ 622 622 if (dwData & DMACTL_RUN) \ 623 623 VNSvOutPortD(iobase + MAC_REG_RXDMACTL0, DMACTL_WAKE); \ 624 624 else \ ··· 628 628 #define MACvReceive1(iobase) \ 629 629 do { \ 630 630 unsigned long dwData; \ 631 - VNSvInPortD(iobase + MAC_REG_RXDMACTL1, &dwData); \ 631 + dwData = ioread32(iobase + MAC_REG_RXDMACTL1); \ 632 632 if (dwData & DMACTL_RUN) \ 633 633 VNSvOutPortD(iobase + MAC_REG_RXDMACTL1, DMACTL_WAKE); \ 634 634 else \ ··· 638 638 #define MACvTransmit0(iobase) \ 639 639 do { \ 640 640 unsigned long dwData; \ 641 - VNSvInPortD(iobase + MAC_REG_TXDMACTL0, &dwData); \ 641 + dwData = ioread32(iobase + MAC_REG_TXDMACTL0); \ 642 642 if (dwData & DMACTL_RUN) \ 643 643 VNSvOutPortD(iobase + MAC_REG_TXDMACTL0, DMACTL_WAKE); \ 644 644 else \ ··· 648 648 #define MACvTransmitAC0(iobase) \ 649 649 do { \ 650 650 unsigned long dwData; \ 651 - VNSvInPortD(iobase + MAC_REG_AC0DMACTL, &dwData); \ 651 + dwData = ioread32(iobase + MAC_REG_AC0DMACTL); \ 652 652 if (dwData & DMACTL_RUN) \ 653 653 VNSvOutPortD(iobase + MAC_REG_AC0DMACTL, DMACTL_WAKE); \ 654 654 else \ ··· 684 684 #define MACvEnableProtectMD(iobase) \ 685 685 do { \ 686 686 unsigned long dwOrgValue; \ 687 - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ 687 + dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ 688 688 dwOrgValue = dwOrgValue | ENCFG_PROTECTMD; \ 689 689 VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ 690 690 } while (0) ··· 692 692 #define MACvDisableProtectMD(iobase) \ 693 693 do { \ 694 694 unsigned long dwOrgValue; \ 695 - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ 695 + dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ 696 696 dwOrgValue = dwOrgValue & ~ENCFG_PROTECTMD; \ 697 697 VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ 698 698 } while (0) ··· 700 700 #define MACvEnableBarkerPreambleMd(iobase) \ 701 701 do { \ 702 702 unsigned long dwOrgValue; \ 703 - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ 703 + dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ 704 704 dwOrgValue = dwOrgValue | ENCFG_BARKERPREAM; \ 705 705 VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ 706 706 } while (0) ··· 708 708 #define MACvDisableBarkerPreambleMd(iobase) \ 709 709 do { \ 710 710 unsigned long dwOrgValue; \ 711 - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ 711 + dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ 712 712 dwOrgValue = dwOrgValue & ~ENCFG_BARKERPREAM; \ 713 713 VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \ 714 714 } while (0) ··· 716 716 #define MACvSetBBType(iobase, byTyp) \ 717 717 do { \ 718 718 unsigned long dwOrgValue; \ 719 - VNSvInPortD(iobase + MAC_REG_ENCFG, &dwOrgValue); \ 719 + dwOrgValue = ioread32(iobase + MAC_REG_ENCFG); \ 720 720 dwOrgValue = dwOrgValue & ~ENCFG_BBTYPE_MASK; \ 721 721 dwOrgValue = dwOrgValue | (unsigned long)byTyp; \ 722 722 VNSvOutPortD(iobase + MAC_REG_ENCFG, dwOrgValue); \
+1 -1
drivers/staging/vt6655/rf.c
··· 175 175 176 176 /* W_MAX_TIMEOUT is the timeout period */ 177 177 for (ww = 0; ww < W_MAX_TIMEOUT; ww++) { 178 - VNSvInPortD(iobase + MAC_REG_IFREGCTL, &dwValue); 178 + dwValue = ioread32(iobase + MAC_REG_IFREGCTL); 179 179 if (dwValue & IFREGCTL_DONE) 180 180 break; 181 181 }
-3
drivers/staging/vt6655/upc.h
··· 20 20 21 21 /* For memory mapped IO */ 22 22 23 - #define VNSvInPortD(dwIOAddress, pdwData) \ 24 - (*(pdwData) = ioread32(dwIOAddress)) 25 - 26 23 #define VNSvOutPortB(dwIOAddress, byData) \ 27 24 iowrite8((u8)(byData), dwIOAddress) 28 25