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

Remove entry .initialize_adapter and replace it with function name
rtl92e_start_adapter. This increases readability of the code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/7457e18ea9f3b2415bf41fca8ac2b22349d2edd1.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 7b8683a9bdb1acba14579061d6e88f94b22da44b..3bebc1153572850f565335d8259dc10d54c154cc 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -27,7 +27,6 @@ static char *ifname = "wlan%d";
 
 static const struct rtl819x_ops rtl819xp_ops = {
        .nic_type                       = NIC_8192E,
-       .initialize_adapter             = rtl92e_start_adapter,
        .link_change                    = rtl92e_link_change,
        .tx_fill_descriptor             = rtl92e_fill_tx_desc,
        .tx_fill_cmd_descriptor         = rtl92e_fill_tx_cmd_desc,
@@ -690,7 +689,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset)
        priv->rtllib->ieee_up = 1;
 
        priv->up_first_time = 0;
-       init_status = priv->ops->initialize_adapter(dev);
+       init_status = rtl92e_start_adapter(dev);
        if (!init_status) {
                netdev_err(dev, "%s(): Initialization failed!\n", __func__);
                return -1;
@@ -2381,7 +2380,7 @@ bool rtl92e_enable_nic(struct net_device *dev)
                return false;
        }
 
-       init_status = priv->ops->initialize_adapter(dev);
+       init_status = rtl92e_start_adapter(dev);
        if (!init_status) {
                netdev_warn(dev, "%s(): Initialization failed!\n", __func__);
                priv->bdisable_nic = false;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 541b7aa366a550ec01345f4e4e029899fd8dcdfa..9edadc62faa9160673b285a4ce3251ff378f3328 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -206,7 +206,6 @@ struct rtl8192_tx_ring {
 struct rtl819x_ops {
        enum nic_t nic_type;
        void (*init_before_adapter_start)(struct net_device *dev);
-       bool (*initialize_adapter)(struct net_device *dev);
        void (*link_change)(struct net_device *dev);
        void (*tx_fill_descriptor)(struct net_device *dev,
                                   struct tx_desc *tx_desc,