From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Forest Bond <forest@alittletooquiet.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 06/11] staging: vt6655: Replace MACvSetCurrBCNTxDescAddr with VNSvOutPortD
Date: Sun, 22 May 2022 21:49:10 +0200 [thread overview]
Message-ID: <1db079979f7e0e3535463d9f31204aa708c6f680.1653203927.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1653203927.git.philipp.g.hortmann@gmail.com>
Replace macro MACvSetCurrBCNTxDescAddr with VNSvOutPortD and as it
was only used twice, it can now be removed.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
The name of macro and the arguments use CamelCase which
is not accepted by checkpatch.pl
VNSvOutPortD will be replaced in this patch series.
---
drivers/staging/vt6655/card.c | 3 +--
drivers/staging/vt6655/mac.h | 5 -----
drivers/staging/vt6655/rxtx.c | 2 +-
3 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c
index 72043a29b543..23804cd72477 100644
--- a/drivers/staging/vt6655/card.c
+++ b/drivers/staging/vt6655/card.c
@@ -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);
}
/*
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index a1d5eb52ddc4..89a3979aeb10 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -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); \
diff --git a/drivers/staging/vt6655/rxtx.c b/drivers/staging/vt6655/rxtx.c
index 390b27b02562..03c2ab8489fa 100644
--- a/drivers/staging/vt6655/rxtx.c
+++ b/drivers/staging/vt6655/rxtx.c
@@ -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 */
--
2.25.1
next prev parent reply other threads:[~2022-05-22 19:49 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-22 19:48 [PATCH 00/11] staging: vt6655: Replace macro VNSvOutPortW,D with iowrite16,32() Philipp Hortmann
2022-05-22 19:48 ` [PATCH 01/11] staging: vt6655: Replace MACvSetCurrBCNLength with VNSvOutPortW Philipp Hortmann
2022-05-22 19:48 ` [PATCH 02/11] staging: vt6655: Replace VNSvOutPortW with iowrite16 Philipp Hortmann
2022-05-22 19:48 ` [PATCH 03/11] staging: vt6655: Replace MACvWriteISR with VNSvOutPortD Philipp Hortmann
2022-05-22 19:49 ` [PATCH 04/11] staging: vt6655: Replace MACvIntEnable " Philipp Hortmann
2022-05-22 19:49 ` [PATCH 05/11] staging: vt6655: Replace MACvIntDisable " Philipp Hortmann
2022-05-22 19:49 ` Philipp Hortmann [this message]
2022-05-22 19:49 ` [PATCH 07/11] staging: vt6655: Replace MACvRx0PerPktMode " Philipp Hortmann
2022-05-22 19:49 ` [PATCH 08/11] staging: vt6655: Replace MACvRx1PerPktMode " Philipp Hortmann
2022-05-22 19:49 ` [PATCH 09/11] staging: vt6655: Replace VNSvOutPortD with iowrite32 Philipp Hortmann
2022-05-22 19:49 ` [PATCH 10/11] staging: vt6655: Add missing BE support on 2x iowrite32 Philipp Hortmann
2022-05-22 19:49 ` [PATCH 11/11] staging: vt6655: Delete upc.h Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1db079979f7e0e3535463d9f31204aa708c6f680.1653203927.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=forest@alittletooquiet.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®