Commit caeadfb0 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman

staging: rtl8188eu: Remove members cmd_[allocated,]_buf from struct cmd_priv

Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce7780ed
...@@ -32,39 +32,18 @@ No irqsave is necessary. ...@@ -32,39 +32,18 @@ No irqsave is necessary.
int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
{ {
int res = _SUCCESS;
sema_init(&(pcmdpriv->cmd_queue_sema), 0); sema_init(&(pcmdpriv->cmd_queue_sema), 0);
/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */
sema_init(&(pcmdpriv->terminate_cmdthread_sema), 0); sema_init(&(pcmdpriv->terminate_cmdthread_sema), 0);
_rtw_init_queue(&(pcmdpriv->cmd_queue)); _rtw_init_queue(&(pcmdpriv->cmd_queue));
/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
pcmdpriv->cmd_seq = 1; pcmdpriv->cmd_seq = 1;
return _SUCCESS;
pcmdpriv->cmd_allocated_buf = kzalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ, GFP_KERNEL);
if (pcmdpriv->cmd_allocated_buf == NULL) {
res = _FAIL;
goto exit;
}
pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((size_t)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1));
exit:
return res;
} }
void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv) void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
{ {
if (pcmdpriv) {
kfree(pcmdpriv->cmd_allocated_buf);
}
} }
/* /*
...@@ -192,7 +171,6 @@ int rtw_cmd_thread(void *context) ...@@ -192,7 +171,6 @@ int rtw_cmd_thread(void *context)
{ {
u8 ret; u8 ret;
struct cmd_obj *pcmd; struct cmd_obj *pcmd;
u8 *pcmdbuf;
u8 (*cmd_hdl)(struct adapter *padapter, u8 *pbuf); u8 (*cmd_hdl)(struct adapter *padapter, u8 *pbuf);
void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd); void (*pcmd_callback)(struct adapter *dev, struct cmd_obj *pcmd);
struct adapter *padapter = (struct adapter *)context; struct adapter *padapter = (struct adapter *)context;
...@@ -200,8 +178,6 @@ int rtw_cmd_thread(void *context) ...@@ -200,8 +178,6 @@ int rtw_cmd_thread(void *context)
allow_signal(SIGTERM); allow_signal(SIGTERM);
pcmdbuf = pcmdpriv->cmd_buf;
pcmdpriv->cmdthd_running = true; pcmdpriv->cmdthd_running = true;
up(&pcmdpriv->terminate_cmdthread_sema); up(&pcmdpriv->terminate_cmdthread_sema);
...@@ -234,15 +210,11 @@ int rtw_cmd_thread(void *context) ...@@ -234,15 +210,11 @@ int rtw_cmd_thread(void *context)
goto post_process; goto post_process;
} }
pcmd->cmdsz = round_up(pcmd->cmdsz, 4);
memcpy(pcmdbuf, pcmd->parmbuf, pcmd->cmdsz);
if (pcmd->cmdcode < ARRAY_SIZE(wlancmds)) { if (pcmd->cmdcode < ARRAY_SIZE(wlancmds)) {
cmd_hdl = wlancmds[pcmd->cmdcode].h2cfuns; cmd_hdl = wlancmds[pcmd->cmdcode].h2cfuns;
if (cmd_hdl) { if (cmd_hdl) {
ret = cmd_hdl(pcmd->padapter, pcmdbuf); ret = cmd_hdl(pcmd->padapter, pcmd->parmbuf);
pcmd->res = ret; pcmd->res = ret;
} }
......
...@@ -48,8 +48,6 @@ struct cmd_priv { ...@@ -48,8 +48,6 @@ struct cmd_priv {
struct semaphore terminate_cmdthread_sema; struct semaphore terminate_cmdthread_sema;
struct __queue cmd_queue; struct __queue cmd_queue;
u8 cmd_seq; u8 cmd_seq;
u8 *cmd_buf; /* shall be non-paged, and 4 bytes aligned */
u8 *cmd_allocated_buf;
u8 cmdthd_running; u8 cmdthd_running;
struct adapter *padapter; struct adapter *padapter;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment