staging: rtl8192e: Remove entry .interrupt_re.. from struct rtl819x_ops
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Tue, 21 Feb 2023 20:53:03 +0000 (21:53 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Mar 2023 16:04:58 +0000 (17:04 +0100)
Remove entry .interrupt_recognized and replace it with function name
rtl92e_ack_irq. This increases readability of the code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/a972ff8963b426f20651810b5161c8759ffa2d05.1677010997.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
drivers/staging/rtl8192e/rtl8192e/rtl_core.h

index f1cde3fc86341a489381568943a4787afdca61ac..3323bdf564ee9e7ccadf5987213e353fe7a35ac9 100644 (file)
@@ -30,7 +30,6 @@ static const struct rtl819x_ops rtl819xp_ops = {
        .link_change                    = rtl92e_link_change,
        .rx_command_packet_handler = NULL,
        .irq_clear                      = rtl92e_clear_irq,
-       .interrupt_recognized           = rtl92e_ack_irq,
        .tx_check_stuck_handler = rtl92e_is_tx_stuck,
        .rx_check_stuck_handler = rtl92e_is_rx_stuck,
 };
@@ -2103,7 +2102,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
 
        spin_lock_irqsave(&priv->irq_th_lock, flags);
 
-       priv->ops->interrupt_recognized(dev, &inta, &intb);
+       rtl92e_ack_irq(dev, &inta, &intb);
 
        if (!inta) {
                spin_unlock_irqrestore(&priv->irq_th_lock, flags);
index 79281c07718257d3525309c5f38ca4299af0a94c..d3558bf6ce23ba0e8ae18fe5a684b537eb602cb0 100644 (file)
@@ -211,8 +211,6 @@ struct rtl819x_ops {
                                          struct sk_buff *skb,
                                          struct rx_desc *pdesc);
        void (*irq_clear)(struct net_device *dev);
-       void (*interrupt_recognized)(struct net_device *dev,
-                                    u32 *p_inta, u32 *p_intb);
        bool (*tx_check_stuck_handler)(struct net_device *dev);
        bool (*rx_check_stuck_handler)(struct net_device *dev);
 };