staging: rtl8192e: Remove entry .tx_fill_cmd_d.. from struct rtl819x_ops

Remove entry .tx_fill_cmd_descriptor and replace it with function name
rtl92e_fill_tx_cmd_desc. This increases readability of the code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/713a48fcd6d56c3cc4e32aea0eeba881e0d092c5.1676840647.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 dd1f4a3..372bb48 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -28,7 +28,6 @@ static char *ifname = "wlan%d";
 static const struct rtl819x_ops rtl819xp_ops = {
        .nic_type                       = NIC_8192E,
        .link_change                    = rtl92e_link_change,
-       .tx_fill_cmd_descriptor         = rtl92e_fill_tx_cmd_desc,
        .rx_query_status_descriptor     = rtl92e_get_rx_stats,
        .rx_command_packet_handler = NULL,
        .stop_adapter                   = rtl92e_stop_adapter,
@@ -1577,7 +1576,7 @@ static void _rtl92e_tx_cmd(struct net_device *dev, struct sk_buff *skb)
 
        tcb_desc = (struct cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
 
-       priv->ops->tx_fill_cmd_descriptor(dev, entry, tcb_desc, skb);
+       rtl92e_fill_tx_cmd_desc(dev, entry, tcb_desc, skb);
 
        __skb_queue_tail(&ring->queue, skb);
        spin_unlock_irqrestore(&priv->irq_th_lock, flags);

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 0d4ae3a..5af1483 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -207,10 +207,6 @@ struct rtl819x_ops {
        enum nic_t nic_type;
        void (*init_before_adapter_start)(struct net_device *dev);
        void (*link_change)(struct net_device *dev);
-       void (*tx_fill_cmd_descriptor)(struct net_device *dev,
-                                      struct tx_desc_cmd *entry,
-                                      struct cb_desc *cb_desc,
-                                      struct sk_buff *skb);
        bool (*rx_query_status_descriptor)(struct net_device *dev,
                                           struct rtllib_rx_stats *stats,
                                           struct rx_desc *pdesc,