staging: rtl8188eu: remove padapter from struct mlme_ext_priv

struct mlme_ext_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/20210505202622.11087-6-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 20feb2f0ef8f2578faca493b972118a283b59dcd..fc991c8c16d2170238715f0d5170ffd47fa7f5be 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4014,8 +4014,6 @@ int init_mlme_ext_priv(struct adapter *padapter)
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
 
-       pmlmeext->padapter = padapter;
-
        init_mlme_ext_priv_value(padapter);
        pmlmeinfo->accept_addba_req = pregistrypriv->accept_addba_req;
 
@@ -4038,7 +4036,7 @@ int init_mlme_ext_priv(struct adapter *padapter)
 
 void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
 {
-       struct adapter *padapter = pmlmeext->padapter;
+       struct adapter *padapter = container_of(pmlmeext, struct adapter, mlmeextpriv);
 
        if (!padapter)
                return;

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
index 03d55eb7dc16bc577a3b3fdd34cf87d8f52c2db3..fcf366f9be9057e1e2c8f7d4af95afbf8f2c1735 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme_ext.h
@@ -383,7 +383,6 @@ struct p2p_oper_class_map {
 };
 
 struct mlme_ext_priv {
-       struct adapter  *padapter;
        u8      mlmeext_init;
        atomic_t        event_seq;
        u16     mgnt_seq;