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 3/5] staging: vt6655: Replace MACvReadISR with VNSvInPortD
Date: Sun, 24 Apr 2022 09:44:17 +0200 [thread overview]
Message-ID: <c819500877055aa4e8d3221dd953b6c92c3ca802.1650784817.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1650784817.git.philipp.g.hortmann@gmail.com>
Replace macro MACvReadISR with VNSvInPortD.
Last patch within this patch series will replace all macros
VNSvInPortD with ioread32. 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.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/vt6655/device_main.c | 4 ++--
drivers/staging/vt6655/mac.h | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 7cceb57a5139..c21787f32252 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1029,7 +1029,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
u32 isr;
unsigned long flags;
- MACvReadISR(priv->port_offset, &isr);
+ VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr);
if (isr == 0)
return;
@@ -1116,7 +1116,7 @@ static void vnt_interrupt_process(struct vnt_private *priv)
ieee80211_queue_stopped(priv->hw, 0))
ieee80211_wake_queues(priv->hw);
- MACvReadISR(priv->port_offset, &isr);
+ VNSvInPortD(priv->port_offset + MAC_REG_ISR, &isr);
MACvReceive0(priv->port_offset);
MACvReceive1(priv->port_offset);
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 74b45e1f0963..5aaa0de20e67 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -666,9 +666,6 @@ do { \
VNSvOutPortB(iobase + MAC_REG_STICKHW, byOrgValue); \
} while (0)
-#define MACvReadISR(iobase, pdwValue) \
- VNSvInPortD(iobase + MAC_REG_ISR, pdwValue)
-
#define MACvWriteISR(iobase, dwValue) \
VNSvOutPortD(iobase + MAC_REG_ISR, dwValue)
--
2.25.1
next prev parent reply other threads:[~2022-04-24 7:44 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-24 7:44 [PATCH 0/5] staging: vt6655: Replace macro VNSvInPortW,D with ioread16,32() Philipp Hortmann
2022-04-24 7:44 ` [PATCH 1/5] staging: vt6655: Replace VNSvInPortW with ioread16 Philipp Hortmann
2022-04-24 7:44 ` [PATCH 2/5] staging: vt6655: Replace MACvReadMIBCounter with VNSvInPortD Philipp Hortmann
2022-04-26 9:38 ` Greg Kroah-Hartman
2022-04-24 7:44 ` Philipp Hortmann [this message]
2022-04-24 7:44 ` [PATCH 4/5] staging: vt6655: Replace two VNSvInPortD with ioread64_lo_hi Philipp Hortmann
2022-04-24 11:27 ` kernel test robot
2022-04-24 14:40 ` kernel test robot
2022-04-26 9:31 ` Greg Kroah-Hartman
2022-04-24 7:44 ` [PATCH 5/5] staging: vt6655: Replace VNSvInPortD with ioread32 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=c819500877055aa4e8d3221dd953b6c92c3ca802.1650784817.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®