Commit 404079e7 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Replace VNSvOutPortB with iowrite8 



Replace macro VNSvOutPortB with iowrite8 because it replaces
just one line.
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl

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


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

drivers/staging/vt6655/baseband.c

+4 −4
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ bool bb_read_embedded(struct vnt_private *priv, unsigned char by_bb_addr, 
	unsigned char by_value;



	/* BB reg offset */

	VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr);

	iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR);



	/* turn on REGR */

	MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGR);
@@ -1952,9 +1952,9 @@ bool bb_write_embedded(struct vnt_private *priv, unsigned char by_bb_addr, 
	unsigned char by_value;



	/* BB reg offset */

	VNSvOutPortB(iobase + MAC_REG_BBREGADR, by_bb_addr);

	iowrite8(by_bb_addr, iobase + MAC_REG_BBREGADR);

	/* set BB data */

	VNSvOutPortB(iobase + MAC_REG_BBREGDATA, by_data);

	iowrite8(by_data, iobase + MAC_REG_BBREGDATA);



	/* turn on BBREGCTL_REGW */

	MACvRegBitsOn(iobase, MAC_REG_BBREGCTL, BBREGCTL_REGW);
@@ -2053,7 +2053,7 @@ bool bb_vt3253_init(struct vnt_private *priv) 
				byVT3253B0_AGC[ii][0],

				byVT3253B0_AGC[ii][1]);



		VNSvOutPortB(iobase + MAC_REG_ITRTMSET, 0x23);

		iowrite8(0x23, iobase + MAC_REG_ITRTMSET);

		MACvRegBitsOn(iobase, MAC_REG_PAPEDELAY, BIT(0));



		priv->abyBBVGA[0] = 0x14;

drivers/staging/vt6655/card.c

+5 −6
Original line number Diff line number Diff line
@@ -238,26 +238,25 @@ bool CARDbSetPhyParameter(struct vnt_private *priv, u8 bb_type) 


	if (priv->bySIFS != bySIFS) {

		priv->bySIFS = bySIFS;

		VNSvOutPortB(priv->port_offset + MAC_REG_SIFS, priv->bySIFS);

		iowrite8(priv->bySIFS, priv->port_offset + MAC_REG_SIFS);

	}

	if (priv->byDIFS != byDIFS) {

		priv->byDIFS = byDIFS;

		VNSvOutPortB(priv->port_offset + MAC_REG_DIFS, priv->byDIFS);

		iowrite8(priv->byDIFS, priv->port_offset + MAC_REG_DIFS);

	}

	if (priv->byEIFS != C_EIFS) {

		priv->byEIFS = C_EIFS;

		VNSvOutPortB(priv->port_offset + MAC_REG_EIFS, priv->byEIFS);

		iowrite8(priv->byEIFS, priv->port_offset + MAC_REG_EIFS);

	}

	if (priv->bySlot != bySlot) {

		priv->bySlot = bySlot;

		VNSvOutPortB(priv->port_offset + MAC_REG_SLOT, priv->bySlot);

		iowrite8(priv->bySlot, priv->port_offset + MAC_REG_SLOT);



		bb_set_short_slot_time(priv);

	}

	if (priv->byCWMaxMin != byCWMaxMin) {

		priv->byCWMaxMin = byCWMaxMin;

		VNSvOutPortB(priv->port_offset + MAC_REG_CWMAXMIN0,

			     priv->byCWMaxMin);

		iowrite8(priv->byCWMaxMin, priv->port_offset + MAC_REG_CWMAXMIN0);

	}



	priv->byPacketType = CARDbyGetPktType(priv);

drivers/staging/vt6655/channel.c

+2 −4
Original line number Diff line number Diff line
@@ -118,11 +118,9 @@ bool set_channel(struct vnt_private *priv, struct ieee80211_channel *ch) 
		/* set HW default power register */

		MACvSelectPage1(priv->port_offset);

		RFbSetPower(priv, RATE_1M, priv->byCurrentCh);

		VNSvOutPortB(priv->port_offset + MAC_REG_PWRCCK,

			     priv->byCurPwr);

		iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWRCCK);

		RFbSetPower(priv, RATE_6M, priv->byCurrentCh);

		VNSvOutPortB(priv->port_offset + MAC_REG_PWROFDM,

			     priv->byCurPwr);

		iowrite8(priv->byCurPwr, priv->port_offset + MAC_REG_PWROFDM);

		MACvSelectPage0(priv->port_offset);



		spin_unlock_irqrestore(&priv->lock, flags);

drivers/staging/vt6655/device_main.c

+10 −14
Original line number Diff line number Diff line
@@ -334,8 +334,7 @@ static void device_init_registers(struct vnt_private *priv) 
	if (priv->local_id > REV_ID_VT3253_B1) {

		MACvSelectPage1(priv->port_offset);



		VNSvOutPortB(priv->port_offset + MAC_REG_MSRCTL + 1,

			     (MSRCTL1_TXPWR | MSRCTL1_CSAPAREN));

		iowrite8(MSRCTL1_TXPWR | MSRCTL1_CSAPAREN, priv->port_offset + MAC_REG_MSRCTL + 1);



		MACvSelectPage0(priv->port_offset);

	}
@@ -349,9 +348,9 @@ static void device_init_registers(struct vnt_private *priv) 
	MACvSetLongRetryLimit(priv, priv->byLongRetryLimit);



	/* reset TSF counter */

	VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);

	iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL);

	/* enable TSF counter */

	VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTREN);

	iowrite8(TFTCTL_TSFCNTREN, priv->port_offset + MAC_REG_TFTCTL);



	/* initialize BBP registers */

	bb_vt3253_init(priv);
@@ -406,8 +405,7 @@ static void device_init_registers(struct vnt_private *priv) 
	MACvReceive1(priv->port_offset);



	/* start the adapter */

	VNSvOutPortB(priv->port_offset + MAC_REG_HOSTCR,

		     (HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON));

	iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, priv->port_offset + MAC_REG_HOSTCR);

}



static void device_print_info(struct vnt_private *priv)
@@ -1061,7 +1059,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) 


		if (isr & ISR_FETALERR) {

			pr_debug(" ISR_FETALERR\n");

			VNSvOutPortB(priv->port_offset + MAC_REG_SOFTPWRCTL, 0);

			iowrite8(0, priv->port_offset + MAC_REG_SOFTPWRCTL);

			VNSvOutPortW(priv->port_offset +

				     MAC_REG_SOFTPWRCTL, SOFTPWRCTL_SWPECTI);

			device_error(priv, isr);
@@ -1408,7 +1406,7 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, 


		spin_lock_irqsave(&priv->lock, flags);



		MACvWriteBSSIDAddress(priv->port_offset, (u8 *)conf->bssid);

		MACvWriteBSSIDAddress(priv->port_offset, conf->bssid);



		spin_unlock_irqrestore(&priv->lock, flags);

	}
@@ -1478,10 +1476,8 @@ static void vnt_bss_info_changed(struct ieee80211_hw *hw, 


			CARDvSetFirstNextTBTT(priv, conf->beacon_int);

		} else {

			VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL,

				     TFTCTL_TSFCNTRST);

			VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL,

				     TFTCTL_TSFCNTREN);

			iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL);

			iowrite8(TFTCTL_TSFCNTREN, priv->port_offset + MAC_REG_TFTCTL);

		}

	}

}
@@ -1562,7 +1558,7 @@ static void vnt_configure(struct ieee80211_hw *hw, 
			rx_mode |= RCR_BSSID;

	}



	VNSvOutPortB(priv->port_offset + MAC_REG_RCR, rx_mode);

	iowrite8(rx_mode, priv->port_offset + MAC_REG_RCR);



	dev_dbg(&priv->pcid->dev, "rx mode out= %x\n", rx_mode);

}
@@ -1622,7 +1618,7 @@ static void vnt_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	struct vnt_private *priv = hw->priv;



	/* reset TSF counter */

	VNSvOutPortB(priv->port_offset + MAC_REG_TFTCTL, TFTCTL_TSFCNTRST);

	iowrite8(TFTCTL_TSFCNTRST, priv->port_offset + MAC_REG_TFTCTL);

}



static const struct ieee80211_ops vnt_mac_ops = {

drivers/staging/vt6655/mac.h

+15 −21
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ 
do {									\

	unsigned char byData;						\

	byData = ioread8(iobase + byRegOfs);				\

	VNSvOutPortB(iobase + byRegOfs, byData | (byBits));		\

	iowrite8(byData | (byBits), iobase + byRegOfs);			\

} while (0)



#define MACvWordRegBitsOn(iobase, byRegOfs, wBits)			\
@@ -555,7 +555,7 @@ do { \ 
do {									\

	unsigned char byData;						\

	byData = ioread8(iobase + byRegOfs);				\

	VNSvOutPortB(iobase + byRegOfs, byData & ~(byBits));		\

	iowrite8(byData & ~(byBits), iobase + byRegOfs);		\

} while (0)



#define MACvWordRegBitsOff(iobase, byRegOfs, wBits)			\
@@ -577,32 +577,26 @@ do { \ 


#define MACvWriteBSSIDAddress(iobase, pbyEtherAddr)		\

do {								\

	VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);		\

	VNSvOutPortB(iobase + MAC_REG_BSSID0,			\

		     *(pbyEtherAddr));				\

	VNSvOutPortB(iobase + MAC_REG_BSSID0 + 1,		\

		     *(pbyEtherAddr + 1));			\

	VNSvOutPortB(iobase + MAC_REG_BSSID0 + 2,		\

		     *(pbyEtherAddr + 2));			\

	VNSvOutPortB(iobase + MAC_REG_BSSID0 + 3,		\

		     *(pbyEtherAddr + 3));			\

	VNSvOutPortB(iobase + MAC_REG_BSSID0 + 4,		\

		     *(pbyEtherAddr + 4));			\

	VNSvOutPortB(iobase + MAC_REG_BSSID0 + 5,		\

		     *(pbyEtherAddr + 5));			\

	VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0);		\

	iowrite8(1, iobase + MAC_REG_PAGE1SEL);			\

	iowrite8(pbyEtherAddr[0], iobase + MAC_REG_BSSID0);	\

	iowrite8(pbyEtherAddr[1], iobase + MAC_REG_BSSID0 + 1);	\

	iowrite8(pbyEtherAddr[2], iobase + MAC_REG_BSSID0 + 2);	\

	iowrite8(pbyEtherAddr[3], iobase + MAC_REG_BSSID0 + 3);	\

	iowrite8(pbyEtherAddr[4], iobase + MAC_REG_BSSID0 + 4);	\

	iowrite8(pbyEtherAddr[5], iobase + MAC_REG_BSSID0 + 5);	\

	iowrite8(0, iobase + MAC_REG_PAGE1SEL);			\

} while (0)



#define MACvReadEtherAddress(iobase, pbyEtherAddr)		\

do {								\

	VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1);		\

	iowrite8(1, iobase + MAC_REG_PAGE1SEL);			\

	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);		\

	iowrite8(0, iobase + MAC_REG_PAGE1SEL);			\

} while (0)



#define MACvRx0PerPktMode(iobase)					\
@@ -656,7 +650,7 @@ do { \ 
	unsigned char byOrgValue;					\

	byOrgValue = ioread8(iobase + MAC_REG_STICKHW);			\

	byOrgValue = byOrgValue & 0xFC;					\

	VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue);		\

	iowrite8(byOrgValue, iobase + MAC_REG_STICKHW);			\

} while (0)



#define MACvWriteISR(iobase, dwValue)				\
@@ -669,10 +663,10 @@ do { \ 
	VNSvOutPortD(iobase + MAC_REG_IMR, 0)



#define MACvSelectPage0(iobase)				\

		VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 0)

	iowrite8(0, iobase + MAC_REG_PAGE1SEL)



#define MACvSelectPage1(iobase)				\

	VNSvOutPortB(iobase + MAC_REG_PAGE1SEL, 1)

	iowrite8(1, iobase + MAC_REG_PAGE1SEL)



#define MACvEnableProtectMD(iobase)					\

do {									\