Skip to content

Commit

Permalink
staging: rtl8188eu: remove padapter from struct cmd_priv
Browse files Browse the repository at this point in the history
struct cmd_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-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Martin Kaiser authored and Greg Kroah-Hartman committed May 10, 2021
1 parent 286d600 commit 24aa9ca
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
9 changes: 5 additions & 4 deletions drivers/staging/rtl8188eu/core/rtw_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,12 @@ struct cmd_obj *rtw_dequeue_cmd(struct __queue *queue)

static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{
struct adapter *padapter = container_of(pcmdpriv, struct adapter, cmdpriv);
u8 bAllow = false; /* set to true to allow enqueuing cmd when hw_init_completed is false */

/* To decide allow or not */
if ((pcmdpriv->padapter->pwrctrlpriv.bHWPwrPindetect) &&
(!pcmdpriv->padapter->registrypriv.usbss_enable)) {
if ((padapter->pwrctrlpriv.bHWPwrPindetect) &&
(!padapter->registrypriv.usbss_enable)) {
if (cmd_obj->cmdcode == _Set_Drv_Extra_CMD_) {
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;

Expand All @@ -119,7 +120,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
if (cmd_obj->cmdcode == _SetChannelPlan_CMD_)
bAllow = true;

if ((!pcmdpriv->padapter->hw_init_completed && !bAllow) ||
if ((!padapter->hw_init_completed && !bAllow) ||
!pcmdpriv->cmdthd_running) /* com_thread not running */
return _FAIL;
return _SUCCESS;
Expand All @@ -128,7 +129,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{
int res = _FAIL;
struct adapter *padapter = pcmdpriv->padapter;
struct adapter *padapter = container_of(pcmdpriv, struct adapter, cmdpriv);

if (!cmd_obj)
goto exit;
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/rtl8188eu/include/rtw_cmd.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ struct cmd_priv {
struct completion terminate_cmdthread_comp;
struct __queue cmd_queue;
u8 cmdthd_running;
struct adapter *padapter;
};

#define init_h2fwcmd_w_parm_no_rsp(pcmd, pparm, code) \
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/rtl8188eu/os_dep/os_intfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter)

rtw_init_cmd_priv(&padapter->cmdpriv);

padapter->cmdpriv.padapter = padapter;

if (rtw_init_mlme_priv(padapter) == _FAIL) {
RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init mlme_priv\n"));
ret8 = _FAIL;
Expand Down

0 comments on commit 24aa9ca

Please sign in to comment.