Skip to content

Commit 81c412c

Browse files
Philipp Hortmanngregkh
authored andcommitted
staging: rtl8192e: Convert array rx_buf[][] to array rx_buf[]
Convert array rx_buf[][] to array rx_buf[] 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/967337963336cf09383003050b12c43c779e1562.1698295861.git.philipp.g.hortmann@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8e842c4 commit 81c412c

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ static void _rtl92e_free_rx_ring(struct net_device *dev)
11451145
int rx_queue_idx = 0;
11461146

11471147
for (i = 0; i < priv->rxringcount; i++) {
1148-
struct sk_buff *skb = priv->rx_buf[rx_queue_idx][i];
1148+
struct sk_buff *skb = priv->rx_buf[i];
11491149

11501150
if (!skb)
11511151
continue;
@@ -1373,7 +1373,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
13731373
if (!skb)
13741374
return 0;
13751375
skb->dev = dev;
1376-
priv->rx_buf[rx_queue_idx][i] = skb;
1376+
priv->rx_buf[i] = skb;
13771377
mapping = (dma_addr_t *)skb->cb;
13781378
*mapping = dma_map_single(&priv->pdev->dev,
13791379
skb_tail_pointer(skb),
@@ -1575,7 +1575,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
15751575
while (count--) {
15761576
struct rx_desc *pdesc = &priv->rx_ring
15771577
[priv->rx_idx[rx_queue_idx]];
1578-
struct sk_buff *skb = priv->rx_buf[rx_queue_idx]
1578+
struct sk_buff *skb = priv->rx_buf
15791579
[priv->rx_idx[rx_queue_idx]];
15801580
struct sk_buff *new_skb;
15811581

@@ -1614,7 +1614,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
16141614
skb = new_skb;
16151615
skb->dev = dev;
16161616

1617-
priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] =
1617+
priv->rx_buf[priv->rx_idx[rx_queue_idx]] =
16181618
skb;
16191619
*((dma_addr_t *)skb->cb) = dma_map_single(&priv->pdev->dev,
16201620
skb_tail_pointer(skb),

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ struct r8192_priv {
233233
u8 (*rf_set_chan)(struct net_device *dev, u8 ch);
234234

235235
struct rx_desc *rx_ring;
236-
struct sk_buff *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT];
236+
struct sk_buff *rx_buf[MAX_RX_COUNT];
237237
dma_addr_t rx_ring_dma[MAX_RX_QUEUE];
238238
unsigned int rx_idx[MAX_RX_QUEUE];
239239
int rxringcount;

0 commit comments

Comments
 (0)