staging: rtl8192e: Remove entry .stop_adapter from struct rtl819x_ops

Remove entry .stop_adapter and replace it with function name
rtl92e_stop_adapter. This increases readability of the code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/87f874eae22027956b9f1140b8d460ed8b63a9f9.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 a479633..5665133 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -29,7 +29,6 @@ static const struct rtl819x_ops rtl819xp_ops = {
        .nic_type                       = NIC_8192E,
        .link_change                    = rtl92e_link_change,
        .rx_command_packet_handler = NULL,
-       .stop_adapter                   = rtl92e_stop_adapter,
        .update_ratr_table              = rtl92e_update_ratr_table,
        .irq_enable                     = rtl92e_enable_irq,
        .irq_disable                    = rtl92e_disable_irq,
@@ -756,7 +755,7 @@ static int _rtl92e_sta_down(struct net_device *dev, bool shutdownrf)
        }
        priv->rf_change_in_progress = true;
        spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
-       priv->ops->stop_adapter(dev, false);
+       rtl92e_stop_adapter(dev, false);
        spin_lock_irqsave(&priv->rf_ps_lock, flags);
        priv->rf_change_in_progress = false;
        spin_unlock_irqrestore(&priv->rf_ps_lock, flags);
@@ -2055,7 +2054,7 @@ void rtl92e_commit(struct net_device *dev)
                return;
        rtllib_softmac_stop_protocol(priv->rtllib, 0, true);
        rtl92e_irq_disable(dev);
-       priv->ops->stop_adapter(dev, true);
+       rtl92e_stop_adapter(dev, true);
        _rtl92e_up(dev, false);
 }
 
@@ -2401,7 +2400,7 @@ bool rtl92e_disable_nic(struct net_device *dev)
        _rtl92e_cancel_deferred_work(priv);
        rtl92e_irq_disable(dev);
 
-       priv->ops->stop_adapter(dev, false);
+       rtl92e_stop_adapter(dev, false);
        return true;
 }
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index d83af5f..083bba3 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -210,7 +210,6 @@ struct rtl819x_ops {
        bool (*rx_command_packet_handler)(struct net_device *dev,
                                          struct sk_buff *skb,
                                          struct rx_desc *pdesc);
-       void (*stop_adapter)(struct net_device *dev, bool reset);
        void (*update_ratr_table)(struct net_device *dev);
        void (*irq_enable)(struct net_device *dev);
        void (*irq_disable)(struct net_device *dev);