Commit 08bea7da authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Replace 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

Since there are more than one checkpatch issue per line,
more steps are rquired to fix.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fd71797d9d55d53f95c5c4e2df826bf85dd4626a.1650094595.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bcac7e6e

drivers/staging/vt6655/baseband.c

+3 −3
Original line number Diff line number Diff line
@@ -1915,13 +1915,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");
@@ -1960,7 +1960,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
Original line number Diff line number Diff line
@@ -747,7 +747,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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -540,7 +540,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)
@@ -554,7 +554,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)
@@ -596,18 +596,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)
@@ -667,7 +661,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
Original line number Diff line number Diff line
@@ -65,7 +65,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++) {
@@ -76,7 +76,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);
@@ -86,7 +86,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;

}