From: Martin Kaiser <martin@kaiser.cx>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 6/6] staging: rtl8188eu: remove padapter from struct mlme_ext_priv
Date: Wed, 5 May 2021 22:26:22 +0200 [thread overview]
Message-ID: <20210505202622.11087-6-martin@kaiser.cx> (raw)
In-Reply-To: <20210505202622.11087-1-martin@kaiser.cx>
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>
---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 4 +---
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 1 -
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 50d3c3631be0..25118ca08562 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -4017,8 +4017,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;
@@ -4041,7 +4039,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 03d55eb7dc16..fcf366f9be90 100644
--- 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;
--
2.20.1
next prev parent reply other threads:[~2021-05-05 20:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 20:26 [PATCH 1/6] staging: rtl8188eu: make rtw_android_cmdstr_to_num static Martin Kaiser
2021-05-05 20:26 ` [PATCH 2/6] staging: rtl8188eu: rtw_init_cmd_priv never fails Martin Kaiser
2021-05-05 20:26 ` [PATCH 3/6] staging: rtl8188eu: don't block until cmdthread runs Martin Kaiser
2021-05-05 20:26 ` [PATCH 4/6] staging: rtl8188eu: remove padapter from struct cmd_priv Martin Kaiser
2021-05-05 20:26 ` [PATCH 5/6] staging: rtl8188eu: remove nic_hdl from struct mlme_priv Martin Kaiser
2021-05-06 10:14 ` Greg Kroah-Hartman
2021-05-05 20:26 ` Martin Kaiser [this message]
2021-05-06 12:14 ` [PATCH v2] " Martin Kaiser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210505202622.11087-6-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).