diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-05-22 22:49:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-06 08:58:40 +0300 |
| commit | 159ed04755489cf9d43ee361899f736418c4c340 (patch) | |
| tree | f13e0ad6d3a679f70860f226afd47bcbff0f9c84 | |
| parent | 0fd13e6b1acee1c42569e70f93444b0c5fd7a348 (diff) | |
| download | linux-159ed04755489cf9d43ee361899f736418c4c340.tar.xz | |
staging: vt6655: Replace MACvIntEnable with VNSvOutPortD
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>
Link: https://lore.kernel.org/r/182b9f8edd1ce3f6ff12a2942e990dae0f80099a.1653203927.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 6 | ||||
| -rw-r--r-- | 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) |