diff options
| author |   Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2022-07-29 10:14:34 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-16 15:09:55 +0200 |
| commit | f4726f7f4f138272658c5a21cf243ac10f76317e (patch) | |
| tree | b1a84d30ea3addc3b2ff2023ef8d17bbdc5118e1 /drivers/staging/vt6655 | |
| parent | staging: vt6655: Rename function MACvReceive0 and add parameter (diff) | |
| download | linux-dev-f4726f7f4f138272658c5a21cf243ac10f76317e.tar.xz linux-dev-f4726f7f4f138272658c5a21cf243ac10f76317e.zip | |
staging: vt6655: Replace MACvReceive1 with function vt6655_mac_dma_ctl
Convert macro MACvReceive1 to existing static function. This saves
codelines and multiline macros are not liked by kernel community.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/ec8dbbfeccb32e0b5c753702cb70d2749426c054.1659080988.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6655/mac.h | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 5b4d3d7e1a0b..ca38a38565f7 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -432,7 +432,7 @@ static void device_init_registers(struct vnt_private *priv) /* Turn On Rx DMA */ vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); - MACvReceive1(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1); /* start the adapter */ iowrite8(HOSTCR_MACEN | HOSTCR_RXON | HOSTCR_TXON, priv->port_offset + MAC_REG_HOSTCR); @@ -1147,7 +1147,7 @@ static void vnt_interrupt_process(struct vnt_private *priv) isr = ioread32(priv->port_offset + MAC_REG_ISR); vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL0); - MACvReceive1(priv->port_offset); + vt6655_mac_dma_ctl(priv->port_offset, MAC_REG_RXDMACTL1); if (max_count > priv->opts.int_works) break; diff --git a/drivers/staging/vt6655/mac.h b/drivers/staging/vt6655/mac.h index d21313f3067e..5a473ca393f2 100644 --- a/drivers/staging/vt6655/mac.h +++ b/drivers/staging/vt6655/mac.h @@ -537,16 +537,6 @@ /*--------------------- Export Macros ------------------------------*/ -#define MACvReceive1(iobase) \ -do { \ - unsigned long dwData; \ - dwData = ioread32(iobase + MAC_REG_RXDMACTL1); \ - if (dwData & DMACTL_RUN) \ - iowrite32(DMACTL_WAKE, iobase + MAC_REG_RXDMACTL1); \ - else \ - iowrite32(DMACTL_RUN, iobase + MAC_REG_RXDMACTL1); \ -} while (0) - #define MACvTransmit0(iobase) \ do { \ unsigned long dwData; \ |