Skip to content

Commit 3360236

Browse files
Philipp Hortmanngregkh
authored andcommitted
staging: rtl8192e: Convert array rx_ring_dma[] to variable rx_ring_dma
Convert array rx_ring_dma[] to variable rx_ring_dma as index is always 0. This increases readability. Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> Reviewed-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://lore.kernel.org/r/51d3be0a715452cefe5ac6dd29a86fbe65b824fa.1698295861.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 81c412c commit 3360236

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1841,7 +1841,7 @@ void rtl92e_enable_rx(struct net_device *dev)
18411841
{
18421842
struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
18431843

1844-
rtl92e_writel(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
1844+
rtl92e_writel(dev, RDQDA, priv->rx_ring_dma);
18451845
}
18461846

18471847
static const u32 TX_DESC_BASE[] = {

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,7 +1159,7 @@ static void _rtl92e_free_rx_ring(struct net_device *dev)
11591159
dma_free_coherent(&priv->pdev->dev,
11601160
sizeof(*priv->rx_ring) * priv->rxringcount,
11611161
priv->rx_ring,
1162-
priv->rx_ring_dma[rx_queue_idx]);
1162+
priv->rx_ring_dma);
11631163
priv->rx_ring = NULL;
11641164
}
11651165

@@ -1356,7 +1356,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
13561356

13571357
priv->rx_ring = dma_alloc_coherent(&priv->pdev->dev,
13581358
sizeof(*priv->rx_ring) * priv->rxringcount,
1359-
&priv->rx_ring_dma[rx_queue_idx],
1359+
&priv->rx_ring_dma,
13601360
GFP_ATOMIC);
13611361
if (!priv->rx_ring || (unsigned long)priv->rx_ring & 0xFF) {
13621362
netdev_warn(dev, "Cannot allocate RX ring\n");

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ struct r8192_priv {
234234

235235
struct rx_desc *rx_ring;
236236
struct sk_buff *rx_buf[MAX_RX_COUNT];
237-
dma_addr_t rx_ring_dma[MAX_RX_QUEUE];
237+
dma_addr_t rx_ring_dma;
238238
unsigned int rx_idx[MAX_RX_QUEUE];
239239
int rxringcount;
240240
u16 rxbuffersize;

0 commit comments

Comments
 (0)