staging: rtl8188eu: remove nic_hdl from struct mlme_priv

struct mlme_priv is an element of struct adapter. Use container_of
to get a pointer to the enclosing struct.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20210506121410.17613-1-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index 049e254558492b8dc270b46697639fee56cd5923..159465b073c2f48873c17438832062462ffc6e55 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -32,8 +32,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)
 
        /*  We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
 
-       pmlmepriv->nic_hdl = (u8 *)padapter;
-
        pmlmepriv->pscanned = NULL;
        pmlmepriv->fw_state = 0;
        pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown;
@@ -1446,7 +1444,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
 {
        int ret;
        struct list_head *phead;
-       struct adapter *adapter;
+       struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv);
        struct __queue *queue = &pmlmepriv->scanned_queue;
        struct wlan_network *pnetwork = NULL;
        struct wlan_network *candidate = NULL;
@@ -1454,7 +1452,6 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
 
        spin_lock_bh(&pmlmepriv->scanned_queue.lock);
        phead = get_list_head(queue);
-       adapter = (struct adapter *)pmlmepriv->nic_hdl;
        list_for_each(pmlmepriv->pscanned, phead) {
                pnetwork = list_entry(pmlmepriv->pscanned,
                                      struct wlan_network, list);

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 1b74b32b8a81ec99aeeace74c6a5d4c08d946c35..f5e805c134420b560e141716e0fdc229bb2d527c 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -111,8 +111,6 @@ struct mlme_priv {
        u8 to_join; /* flag */
        u8 to_roaming; /*  roaming trying times */
 
-       u8 *nic_hdl;
-
        struct list_head *pscanned;
        struct __queue free_bss_pool;
        struct __queue scanned_queue;