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>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index d0d5b1dfff4814b72f14ae88496e4f8d93b40ca6..573d548e44d802416dfbb9ba03bd831e0c192836 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1145,7 +1145,7 @@ static void _rtl92e_free_rx_ring(struct net_device *dev)
        int rx_queue_idx = 0;
 
        for (i = 0; i < priv->rxringcount; i++) {
-               struct sk_buff *skb = priv->rx_buf[rx_queue_idx][i];
+               struct sk_buff *skb = priv->rx_buf[i];
 
                if (!skb)
                        continue;
@@ -1373,7 +1373,7 @@ static short _rtl92e_alloc_rx_ring(struct net_device *dev)
                if (!skb)
                        return 0;
                skb->dev = dev;
-               priv->rx_buf[rx_queue_idx][i] = skb;
+               priv->rx_buf[i] = skb;
                mapping = (dma_addr_t *)skb->cb;
                *mapping = dma_map_single(&priv->pdev->dev,
                                          skb_tail_pointer(skb),
@@ -1575,7 +1575,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
        while (count--) {
                struct rx_desc *pdesc = &priv->rx_ring
                                        [priv->rx_idx[rx_queue_idx]];
-               struct sk_buff *skb = priv->rx_buf[rx_queue_idx]
+               struct sk_buff *skb = priv->rx_buf
                                      [priv->rx_idx[rx_queue_idx]];
                struct sk_buff *new_skb;
 
@@ -1614,7 +1614,7 @@ static void _rtl92e_rx_normal(struct net_device *dev)
                skb = new_skb;
                skb->dev = dev;
 
-               priv->rx_buf[rx_queue_idx][priv->rx_idx[rx_queue_idx]] =
+               priv->rx_buf[priv->rx_idx[rx_queue_idx]] =
                                                                 skb;
                *((dma_addr_t *)skb->cb) = dma_map_single(&priv->pdev->dev,
                                                          skb_tail_pointer(skb),

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index caa8a00cc9227fbc0f2f9f187ffface458547b16..2a99873fbe903f9a0ffc1e50bf6fe5e8b4e2c494 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -233,7 +233,7 @@ struct r8192_priv {
        u8 (*rf_set_chan)(struct net_device *dev, u8 ch);
 
        struct rx_desc *rx_ring;
-       struct sk_buff  *rx_buf[MAX_RX_QUEUE][MAX_RX_COUNT];
+       struct sk_buff  *rx_buf[MAX_RX_COUNT];
        dma_addr_t      rx_ring_dma[MAX_RX_QUEUE];
        unsigned int    rx_idx[MAX_RX_QUEUE];
        int             rxringcount;