* [patch] mwifiex: remove an unneede NULL check in mwifiex_init_adapter()
@ 2015-03-23 9:35 Dan Carpenter
2015-03-23 11:28 ` Amitkumar Karwar
2015-03-30 8:34 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2015-03-23 9:35 UTC (permalink / raw)
To: Amitkumar Karwar
Cc: Avinash Patil, Kalle Valo, linux-wireless, kernel-janitors
"adapter->sleep_cfm" is always non-NULL at this point. Static checkers
complain that we already dereference it at the start of the function
when we do:
skb_put(adapter->sleep_cfm, sizeof(struct mwifiex_opt_sleep_confirm));
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c
index 6936de8..e12192f 100644
--- a/drivers/net/wireless/mwifiex/init.c
+++ b/drivers/net/wireless/mwifiex/init.c
@@ -266,18 +266,15 @@ static void mwifiex_init_adapter(struct mwifiex_adapter *adapter)
mwifiex_wmm_init(adapter);
- if (adapter->sleep_cfm) {
- sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)
- adapter->sleep_cfm->data;
- memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len);
- sleep_cfm_buf->command =
- cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
- sleep_cfm_buf->size =
- cpu_to_le16(adapter->sleep_cfm->len);
- sleep_cfm_buf->result = 0;
- sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM);
- sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED);
- }
+ sleep_cfm_buf = (struct mwifiex_opt_sleep_confirm *)
+ adapter->sleep_cfm->data;
+ memset(sleep_cfm_buf, 0, adapter->sleep_cfm->len);
+ sleep_cfm_buf->command = cpu_to_le16(HostCmd_CMD_802_11_PS_MODE_ENH);
+ sleep_cfm_buf->size = cpu_to_le16(adapter->sleep_cfm->len);
+ sleep_cfm_buf->result = 0;
+ sleep_cfm_buf->action = cpu_to_le16(SLEEP_CONFIRM);
+ sleep_cfm_buf->resp_ctrl = cpu_to_le16(RESP_NEEDED);
+
memset(&adapter->sleep_params, 0, sizeof(adapter->sleep_params));
memset(&adapter->sleep_period, 0, sizeof(adapter->sleep_period));
adapter->tx_lock_flag = false;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [patch] mwifiex: remove an unneede NULL check in mwifiex_init_adapter()
2015-03-23 9:35 [patch] mwifiex: remove an unneede NULL check in mwifiex_init_adapter() Dan Carpenter
@ 2015-03-23 11:28 ` Amitkumar Karwar
2015-03-30 8:34 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Amitkumar Karwar @ 2015-03-23 11:28 UTC (permalink / raw)
To: Dan Carpenter
Cc: Avinash Patil, Kalle Valo, linux-wireless@vger.kernel.org,
kernel-janitors@vger.kernel.org
Hi Dan,
Thanks for the patch.
> Subject: [patch] mwifiex: remove an unneede NULL check in
> mwifiex_init_adapter()
>
> "adapter->sleep_cfm" is always non-NULL at this point. Static checkers
> complain that we already dereference it at the start of the function
> when we do:
>
> skb_put(adapter->sleep_cfm, sizeof(struct
> mwifiex_opt_sleep_confirm));
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
Acked-by: Amitkumar Karwar <akarwar@marvell.com>
Regards,
Amit
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: mwifiex: remove an unneede NULL check in mwifiex_init_adapter()
2015-03-23 9:35 [patch] mwifiex: remove an unneede NULL check in mwifiex_init_adapter() Dan Carpenter
2015-03-23 11:28 ` Amitkumar Karwar
@ 2015-03-30 8:34 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2015-03-30 8:34 UTC (permalink / raw)
To: Dan Carpenter
Cc: Amitkumar Karwar, Avinash Patil, linux-wireless, kernel-janitors
> "adapter->sleep_cfm" is always non-NULL at this point. Static checkers
> complain that we already dereference it at the start of the function
> when we do:
>
> skb_put(adapter->sleep_cfm, sizeof(struct mwifiex_opt_sleep_confirm));
>
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Acked-by: Amitkumar Karwar <akarwar@marvell.com>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-30 8:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-23 9:35 [patch] mwifiex: remove an unneede NULL check in mwifiex_init_adapter() Dan Carpenter
2015-03-23 11:28 ` Amitkumar Karwar
2015-03-30 8:34 ` Kalle Valo
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).