Commit 6b2564ab authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: Replace MACvSetCurrBCNTxDescAddr with VNSvOutPortD 



Replace macro MACvSetCurrBCNTxDescAddr with VNSvOutPortD and as it
was only used twice, it can now be removed.

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


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

drivers/staging/vt6655/card.c

+1 −2
Original line number Diff line number Diff line
@@ -411,8 +411,7 @@ void CARDvSafeResetTx(struct vnt_private *priv) 
	MACvSetCurrTXDescAddr(TYPE_AC0DMA, priv, priv->td1_pool_dma);



	/* set MAC Beacon TX pointer */

	MACvSetCurrBCNTxDescAddr(priv->port_offset,

				 (priv->tx_beacon_dma));

	VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma);

}



/*

drivers/staging/vt6655/mac.h

+0 −5
Original line number Diff line number Diff line
@@ -565,11 +565,6 @@ do { \ 
	iowrite16(wData & ~(wBits), iobase + byRegOfs);			\

} while (0)



/* set the chip with current BCN tx descriptor address */

#define MACvSetCurrBCNTxDescAddr(iobase, dwCurrDescAddr)	\

	VNSvOutPortD(iobase + MAC_REG_BCNDMAPTR,		\

		     dwCurrDescAddr)



#define MACvWriteBSSIDAddress(iobase, pbyEtherAddr)		\

do {								\

	iowrite8(1, iobase + MAC_REG_PAGE1SEL);			\

drivers/staging/vt6655/rxtx.c

+1 −1
Original line number Diff line number Diff line
@@ -1420,7 +1420,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, 


	priv->wBCNBufLen = sizeof(*short_head) + skb->len;



	MACvSetCurrBCNTxDescAddr(priv->port_offset, priv->tx_beacon_dma);

	VNSvOutPortD(priv->port_offset + MAC_REG_BCNDMAPTR, priv->tx_beacon_dma);



	iowrite16(priv->wBCNBufLen, priv->port_offset + MAC_REG_BCNDMACTL + 2);

	/* Set auto Transmit on */