Skip to contentSkip to conversation

mwifiex: remove an unneede NULL check in mwifiex_init_adapter()

PATCH Applied Dan Carpenter 3 participants 3 messages Mar 23, 2015 – Mar 30, 2015

Subsystems (2)
Kernel janitors Networking drivers (wireless)
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
drivers/net/wireless/mwifiex/init.c +9 -10
index 6936de8..e12192f 100644
@@ -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;
Acked-by on v1 1/1
#1 lore raw

Hi Dan,

Thanks for the patch.

Quoted 12 lines

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 <[email protected]>
Acked-by Amitkumar Karwar <[email protected]>

Regards,
Amit