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 04/11] staging: vt6655: Replace MACvIntEnable with VNSvOutPortD
Date: Sun, 22 May 2022 21:49:00 +0200 [thread overview]
Message-ID: <182b9f8edd1ce3f6ff12a2942e990dae0f80099a.1653203927.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1653203927.git.philipp.g.hortmann@gmail.com>
Replace macro MACvIntEnable 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/device_main.c | 6 +++---
drivers/staging/vt6655/mac.h | 3 ---
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index 41bc87d80ad8..d9515eff05c3 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -1134,7 +1134,7 @@ static void vnt_interrupt_work(struct work_struct *work)
if (priv->vif)
vnt_interrupt_process(priv);
- MACvIntEnable(priv->port_offset, IMR_MASK_VALUE);
+ VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE);
}
static irqreturn_t vnt_interrupt(int irq, void *arg)
@@ -1252,8 +1252,8 @@ static int vnt_start(struct ieee80211_hw *hw)
device_init_registers(priv);
- dev_dbg(&priv->pcid->dev, "call MACvIntEnable\n");
- MACvIntEnable(priv->port_offset, IMR_MASK_VALUE);
+ dev_dbg(&priv->pcid->dev, "enable MAC interrupt\n");
+ VNSvOutPortD(priv->port_offset + MAC_REG_IMR, IMR_MASK_VALUE);
ieee80211_wake_queues(hw);
diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h
index 42b216897218..8b3ba94dd02e 100644
--- a/drivers/staging/vt6655/mac.h
+++ b/drivers/staging/vt6655/mac.h
@@ -648,9 +648,6 @@ do { \
iowrite8(byOrgValue, iobase + MAC_REG_STICKHW); \
} while (0)
-#define MACvIntEnable(iobase, dwMask) \
- VNSvOutPortD(iobase + MAC_REG_IMR, dwMask)
-
#define MACvIntDisable(iobase) \
VNSvOutPortD(iobase + MAC_REG_IMR, 0)
--
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 ` Philipp Hortmann [this message]
2022-05-22 19:49 ` [PATCH 05/11] staging: vt6655: Replace MACvIntDisable " Philipp Hortmann
2022-05-22 19:49 ` [PATCH 06/11] staging: vt6655: Replace MACvSetCurrBCNTxDescAddr " Philipp Hortmann
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=182b9f8edd1ce3f6ff12a2942e990dae0f80099a.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®