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

Remove entry .init_adapter_variable and replace it with function name
rtl92e_init_variables. This increases readability of the code.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/cc6134e1cf43a8b74615f9eb4377988e3edd0bca.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 73f3d0973a5a4d7948012ca0f5482939e7629083..7b8683a9bdb1acba14579061d6e88f94b22da44b 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,
-       .init_adapter_variable          = rtl92e_init_variables,
        .initialize_adapter             = rtl92e_start_adapter,
        .link_change                    = rtl92e_link_change,
        .tx_fill_descriptor             = rtl92e_fill_tx_desc,
@@ -974,7 +973,7 @@ static short _rtl92e_init(struct net_device *dev)
        _rtl92e_init_priv_lock(priv);
        _rtl92e_init_priv_task(dev);
        rtl92e_get_eeprom_size(dev);
-       priv->ops->init_adapter_variable(dev);
+       rtl92e_init_variables(dev);
        _rtl92e_get_channel_map(dev);
 
        rtl92e_dm_init(dev);

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