staging: vt6655: Replace macro VNSvInPortB with ioread8()
cover staging: vt6655: Replace macro VNSvInPortB with ioread8()
Replace macro VNSvInPortB with ioread8. Avoid cast of the return value is possible with one exception.
The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl
The one casting exception could be removed by changing bb_read_embedded. Instead of having a unused return value bool the return value could be an unsigned char.
Since there are more than one checkpatch issue per line, more steps are rquired to fix all issues.
This patch series is new but the second patch is already in V4.
Tested with vt6655 on mini PCI Module Transferred this patch over wlan connection of vt6655
Philipp Hortmann (2):
staging: vt6655: Replace MACvGPIOIn with VNSvInPortB
staging: vt6655: Replace VNSvInPortB with ioread8
drivers/staging/vt6655/baseband.c | 6 +++--- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 27 +++++++++------------------ drivers/staging/vt6655/srom.c | 6 +++--- drivers/staging/vt6655/upc.h | 3 --- 6 files changed, 19 insertions(+), 31 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 staging: vt6655: Replace MACvGPIOIn with VNSvInPortB
Replace macro MACvGPIOIn with VNSvInPortB.
Next patch will replace all macros VNSvInPortB with ioread8. The names of macros and the arguments use CamelCase which is not accepted by checkpatch.pl
Since there are more than one checkpatch issue per line, more steps are rquired to fix.
--- drivers/staging/vt6655/device_main.c | 2 +- drivers/staging/vt6655/mac.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/vt6655/device_main.c +1 -1
@@ -377,7 +377,7 @@ static void device_init_registers(struct vnt_private *priv)if (priv->byRadioCtl &EEP_RADIOCTL_ENABLE ) {/* Get GPIO */ -MACvGPIOIn (priv->port_offset, &priv->byGPIO); +VNSvInPortB (priv->port_offset +MAC_REG_GPIOCTL1 , &priv->byGPIO); if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) ||
drivers/staging/vt6655/mac.h +0 -3
@@ -735,9 +735,6 @@ do { \VNSvOutPortD (iobase +MAC_REG_ENCFG , dwOrgValue); \ } while (0) -#define MACvGPIOIn (iobase, pbyValue) \ - VNSvInPortB(iobase + MAC_REG_GPIOCTL1, pbyValue) -#define MACvSetRFLE_LatchBase (iobase) \ MACvWordRegBitsOn(iobase, MAC_REG_SOFTPWRCTL, SOFTPWRCTL_RFLEOPT)
Signature · 1 line
2.25.1
PATCH 2/2 staging: vt6655: Replace VNSvInPortB with ioread8
In reply to Philipp HortmannReplace macro VNSvInPortB with ioread8. Avoid cast of the return value is possible with one exception.
The name of macro and the arguments use CamelCase which is not accepted by checkpatch.pl
Since there are more than one checkpatch issue per line, more steps are rquired to fix.
---
V1 -> V2: This patch was 4/7 and is now 3/6
V2 -> V3: Changed from rename macro arguments to replace
macro VNSvInPortB with ioread8
This patch was 3/6 and is now 1/7
V3 -> V4: Replacement now without a cast of the return value with
only one exception.
Note: The one casting exception could be removed by changing
bb_read_embedded. Instead of having a unused return value bool the return value could be an unsigned char.
--- drivers/staging/vt6655/baseband.c | 6 +++--- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/device_main.c | 6 +++--- drivers/staging/vt6655/mac.h | 24 +++++++++--------------- drivers/staging/vt6655/srom.c | 6 +++--- drivers/staging/vt6655/upc.h | 3 --- 6 files changed, 19 insertions(+), 28 deletions(-)
drivers/staging/vt6655/baseband.c +3 -3
@@ -1916,13 +1916,13 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr,MACvRegBitsOn (iobase,MAC_REG_BBREGCTL ,BBREGCTL_REGR );/* W_MAX_TIMEOUT is the timeout period */ for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (iobase +MAC_REG_BBREGCTL , &by_value); + by_value =ioread8 (iobase +MAC_REG_BBREGCTL );if (by_value &BBREGCTL_DONE )break ; }/* get BB data */ -VNSvInPortB (iobase +MAC_REG_BBREGDATA , pby_data); + *pby_data =ioread8 (iobase +MAC_REG_BBREGDATA );if (ww ==W_MAX_TIMEOUT ) {pr_debug (" DBG_PORT80(0x30)\n" );
@@ -1961,7 +1961,7 @@ bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr,MACvRegBitsOn (iobase,MAC_REG_BBREGCTL ,BBREGCTL_REGW );/* W_MAX_TIMEOUT is the timeout period */ for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (iobase +MAC_REG_BBREGCTL , &by_value); + by_value =ioread8 (iobase +MAC_REG_BBREGCTL );if (by_value &BBREGCTL_DONE )break ; }
drivers/staging/vt6655/card.c +1 -1
@@ -748,7 +748,7 @@ bool CARDbGetCurrentTSF(struct vnt_private *priv, u64 *pqwCurrTSF)MACvRegBitsOn (iobase,MAC_REG_TFTCTL ,TFTCTL_TSFCNTRRD );for (ww =0 ; ww <W_MAX_TIMEOUT ; ww++) { -VNSvInPortB (iobase +MAC_REG_TFTCTL , &data); + data =ioread8 (iobase +MAC_REG_TFTCTL );if (!(data &TFTCTL_TSFCNTRRD ))break ; }
drivers/staging/vt6655/device_main.c +3 -3
@@ -219,7 +219,7 @@ static void device_init_registers(struct vnt_private *priv)MACvInitialize (priv);/* Get Local ID */ -VNSvInPortB (priv->port_offset +MAC_REG_LOCALID , &priv->local_id); + priv->local_id =ioread8 (priv->port_offset +MAC_REG_LOCALID );spin_lock_irqsave (&priv->lock, flags);
@@ -377,7 +377,7 @@ static void device_init_registers(struct vnt_private *priv)if (priv->byRadioCtl &EEP_RADIOCTL_ENABLE ) {/* Get GPIO */ -VNSvInPortB (priv->port_offset +MAC_REG_GPIOCTL1 , &priv->byGPIO); + priv->byGPIO =ioread8 (priv->port_offset +MAC_REG_GPIOCTL1 ); if (((priv->byGPIO & GPIO0_DATA) && !(priv->byRadioCtl & EEP_RADIOCTL_INV)) ||
@@ -1513,7 +1513,7 @@ static void vnt_configure(struct ieee80211_hw *hw, *total_flags &=FIF_ALLMULTI |FIF_OTHER_BSS |FIF_BCN_PRBRESP_PROMISC ; -VNSvInPortB (priv->port_offset +MAC_REG_RCR , &rx_mode); + rx_mode =ioread8 (priv->port_offset +MAC_REG_RCR );dev_dbg (&priv->pcid->dev,"rx mode in = %x\n" , rx_mode);
drivers/staging/vt6655/mac.h +9 -15
@@ -541,7 +541,7 @@#define MACvRegBitsOn (iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + byData = ioread8(iobase + byRegOfs); \ VNSvOutPortB(iobase + byRegOfs, byData | (byBits)); \ } while (0)
@@ -555,7 +555,7 @@ do { \#define MACvRegBitsOff (iobase, byRegOfs, byBits) \ do { \ unsigned char byData; \ - VNSvInPortB(iobase + byRegOfs, &byData); \ + byData = ioread8(iobase + byRegOfs); \ VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits)); \ } while (0)
@@ -597,18 +597,12 @@ do { \#define MACvReadEtherAddress (iobase, pbyEtherAddr) \ do { \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0, \ - (unsigned char *)pbyEtherAddr); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 1, \ - pbyEtherAddr + 1); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 2, \ - pbyEtherAddr + 2); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 3, \ - pbyEtherAddr + 3); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 4, \ - pbyEtherAddr + 4); \ - VNSvInPortB(iobase + MAC_REG_PAR0 + 5, \ - pbyEtherAddr + 5); \ + pbyEtherAddr[0] = ioread8(iobase + MAC_REG_PAR0); \ + pbyEtherAddr[1] = ioread8(iobase + MAC_REG_PAR0 + 1); \ + pbyEtherAddr[2] = ioread8(iobase + MAC_REG_PAR0 + 2); \ + pbyEtherAddr[3] = ioread8(iobase + MAC_REG_PAR0 + 3); \ + pbyEtherAddr[4] = ioread8(iobase + MAC_REG_PAR0 + 4); \ + pbyEtherAddr[5] = ioread8(iobase + MAC_REG_PAR0 + 5); \ VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0); \ } while (0)
@@ -668,7 +662,7 @@ do { \#define MACvClearStckDS (iobase) \ do { \ unsigned char byOrgValue; \ - VNSvInPortB(iobase + MAC_REG_STICKHW, &byOrgValue); \ + byOrgValue = ioread8(iobase + MAC_REG_STICKHW); \ byOrgValue = byOrgValue & 0xFC; \ VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \ } while (0)
drivers/staging/vt6655/srom.c +3 -3
@@ -66,7 +66,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase,unsigned char byOrg; byData =0xFF ; -VNSvInPortB (iobase +MAC_REG_I2MCFG , &byOrg); + byOrg =ioread8 (iobase +MAC_REG_I2MCFG );/* turn off hardware retry for getting NACK */ VNSvOutPortB (iobase +MAC_REG_I2MCFG , (byOrg & (~I2MCFG_NORETRY )));for (wNoACK =0 ; wNoACK <W_MAX_I2CRETRY ; wNoACK++) {
@@ -77,7 +77,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase,VNSvOutPortB (iobase +MAC_REG_I2MCSR ,I2MCSR_EEMR );/* wait DONE be set */ for (wDelay =0 ; wDelay <W_MAX_TIMEOUT ; wDelay++) { -VNSvInPortB (iobase +MAC_REG_I2MCSR , &byWait); + byWait =ioread8 (iobase +MAC_REG_I2MCSR );if (byWait & (I2MCSR_DONE |I2MCSR_NACK ))break ;udelay (CB_DELAY_LOOP_WAIT );
@@ -87,7 +87,7 @@ unsigned char SROMbyReadEmbedded(void __iomem *iobase,break ; } } -VNSvInPortB (iobase +MAC_REG_I2MDIPT , &byData); + byData =ioread8 (iobase +MAC_REG_I2MDIPT );VNSvOutPortB (iobase +MAC_REG_I2MCFG , byOrg);return byData; }
drivers/staging/vt6655/upc.h +0 -3
@@ -20,9 +20,6 @@/* For memory mapped IO */ -#define VNSvInPortB (dwIOAddress, pbyData) \ - (*(pbyData) = ioread8(dwIOAddress)) -#define VNSvInPortW (dwIOAddress, pwData) \ (*(pwData) = ioread16(dwIOAddress))
Signature · 1 line
2.25.1
RE: [PATCH 2/2] staging: vt6655: Replace VNSvInPortB with ioread8
From: Philipp Hortmann
Quoted 4 lines
Sent: 16 April 2022 09:01
Replace macro VNSvInPortB with ioread8. Avoid cast of the return value is possible with one exception.
Unless the hardware might be using PCI io space (which I doubt) shouldn't it be using readb() not ioread8() ?
David
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)