Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5ffddb7 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by John W. Linville
Browse files

mwifiex: remove casts of void pointers 



In some cases local pointers are used to cast void pointers passed to
the function. Those unnecessary local pointers are also removed.

This patch was inspired by Joe Perches' patch
[PATCH net-next 1/2] wireless: Remove casts of void *;
and the comments from Julian Calaby.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Cc: Joe Perches <joe@perches.com>
Cc: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 55f7782e

drivers/net/wireless/mwifiex/11n.c

+13 −20
Original line number Diff line number Diff line
@@ -185,13 +185,12 @@ int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv, 
 *

 * Handling includes changing the header fields into CPU format.

 */

int mwifiex_ret_11n_cfg(struct host_cmd_ds_command *resp, void *data_buf)

int mwifiex_ret_11n_cfg(struct host_cmd_ds_command *resp,

			struct mwifiex_ds_11n_tx_cfg *tx_cfg)

{

	struct mwifiex_ds_11n_tx_cfg *tx_cfg;

	struct host_cmd_ds_11n_cfg *htcfg = &resp->params.htcfg;



	if (data_buf) {

		tx_cfg = (struct mwifiex_ds_11n_tx_cfg *) data_buf;

	if (tx_cfg) {

		tx_cfg->tx_htcap = le16_to_cpu(htcfg->ht_tx_cap);

		tx_cfg->tx_htinfo = le16_to_cpu(htcfg->ht_tx_info);

	}
@@ -208,11 +207,10 @@ int mwifiex_ret_11n_cfg(struct host_cmd_ds_command *resp, void *data_buf) 
 */

int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv,

			     struct host_cmd_ds_command *cmd, int cmd_action,

			     void *data_buf)

			     u16 *buf_size)

{

	struct host_cmd_ds_txbuf_cfg *tx_buf = &cmd->params.tx_buf;

	u16 action = (u16) cmd_action;

	u16 buf_size = *((u16 *) data_buf);



	cmd->command = cpu_to_le16(HostCmd_CMD_RECONFIGURE_TX_BUFF);

	cmd->size =
@@ -220,8 +218,8 @@ int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv, 
	tx_buf->action = cpu_to_le16(action);

	switch (action) {

	case HostCmd_ACT_GEN_SET:

		dev_dbg(priv->adapter->dev, "cmd: set tx_buf=%d\n", buf_size);

		tx_buf->buff_size = cpu_to_le16(buf_size);

		dev_dbg(priv->adapter->dev, "cmd: set tx_buf=%d\n", *buf_size);

		tx_buf->buff_size = cpu_to_le16(*buf_size);

		break;

	case HostCmd_ACT_GEN_GET:

	default:
@@ -240,13 +238,12 @@ int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv, 
 *      - Ensuring correct endian-ness

 */

int mwifiex_cmd_amsdu_aggr_ctrl(struct host_cmd_ds_command *cmd,

				int cmd_action, void *data_buf)

				int cmd_action,

				struct mwifiex_ds_11n_amsdu_aggr_ctrl *aa_ctrl)

{

	struct host_cmd_ds_amsdu_aggr_ctrl *amsdu_ctrl =

		&cmd->params.amsdu_aggr_ctrl;

	u16 action = (u16) cmd_action;

	struct mwifiex_ds_11n_amsdu_aggr_ctrl *aa_ctrl =

		(struct mwifiex_ds_11n_amsdu_aggr_ctrl *) data_buf;



	cmd->command = cpu_to_le16(HostCmd_CMD_AMSDU_AGGR_CTRL);

	cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_amsdu_aggr_ctrl)
@@ -272,15 +269,13 @@ int mwifiex_cmd_amsdu_aggr_ctrl(struct host_cmd_ds_command *cmd, 
 * Handling includes changing the header fields into CPU format.

 */

int mwifiex_ret_amsdu_aggr_ctrl(struct host_cmd_ds_command *resp,

				void *data_buf)

				struct mwifiex_ds_11n_amsdu_aggr_ctrl

				*amsdu_aggr_ctrl)

{

	struct mwifiex_ds_11n_amsdu_aggr_ctrl *amsdu_aggr_ctrl;

	struct host_cmd_ds_amsdu_aggr_ctrl *amsdu_ctrl =

		&resp->params.amsdu_aggr_ctrl;



	if (data_buf) {

		amsdu_aggr_ctrl =

			(struct mwifiex_ds_11n_amsdu_aggr_ctrl *) data_buf;

	if (amsdu_aggr_ctrl) {

		amsdu_aggr_ctrl->enable = le16_to_cpu(amsdu_ctrl->enable);

		amsdu_aggr_ctrl->curr_buf_size =

			le16_to_cpu(amsdu_ctrl->curr_buf_size);
@@ -296,12 +291,10 @@ int mwifiex_ret_amsdu_aggr_ctrl(struct host_cmd_ds_command *resp, 
 *      - Setting HT Tx capability and HT Tx information fields

 *      - Ensuring correct endian-ness

 */

int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd,

			u16 cmd_action, void *data_buf)

int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd, u16 cmd_action,

			struct mwifiex_ds_11n_tx_cfg *txcfg)

{

	struct host_cmd_ds_11n_cfg *htcfg = &cmd->params.htcfg;

	struct mwifiex_ds_11n_tx_cfg *txcfg =

		(struct mwifiex_ds_11n_tx_cfg *) data_buf;



	cmd->command = cpu_to_le16(HostCmd_CMD_11N_CFG);

	cmd->size = cpu_to_le16(sizeof(struct host_cmd_ds_11n_cfg) + S_DS_GEN);

drivers/net/wireless/mwifiex/11n.h

+8 −6
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ int mwifiex_ret_11n_delba(struct mwifiex_private *priv, 
int mwifiex_ret_11n_addba_req(struct mwifiex_private *priv,

			      struct host_cmd_ds_command *resp);

int mwifiex_ret_11n_cfg(struct host_cmd_ds_command *resp,

			void *data_buf);

int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd,

			u16 cmd_action, void *data_buf);

			struct mwifiex_ds_11n_tx_cfg *tx_cfg);

int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd, u16 cmd_action,

			struct mwifiex_ds_11n_tx_cfg *txcfg);



int mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv,

			       struct mwifiex_bssdescriptor *bss_desc,
@@ -62,12 +62,14 @@ int mwifiex_get_rx_reorder_tbl(struct mwifiex_private *priv, 
int mwifiex_get_tx_ba_stream_tbl(struct mwifiex_private *priv,

			       struct mwifiex_ds_tx_ba_stream_tbl *buf);

int mwifiex_ret_amsdu_aggr_ctrl(struct host_cmd_ds_command *resp,

				void *data_buf);

				struct mwifiex_ds_11n_amsdu_aggr_ctrl

				*amsdu_aggr_ctrl);

int mwifiex_cmd_recfg_tx_buf(struct mwifiex_private *priv,

			     struct host_cmd_ds_command *cmd,

			     int cmd_action, void *data_buf);

			     int cmd_action, u16 *buf_size);

int mwifiex_cmd_amsdu_aggr_ctrl(struct host_cmd_ds_command *cmd,

				int cmd_action, void *data_buf);

				int cmd_action,

				struct mwifiex_ds_11n_amsdu_aggr_ctrl *aa_ctrl);



/*

 * This function checks whether AMPDU is allowed or not for a particular TID.

drivers/net/wireless/mwifiex/11n_rxreorder.c

+2 −3
Original line number Diff line number Diff line
@@ -328,13 +328,12 @@ int mwifiex_cmd_11n_addba_req(struct host_cmd_ds_command *cmd, void *data_buf) 
 */

int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,

				  struct host_cmd_ds_command *cmd,

				  void *data_buf)

				  struct host_cmd_ds_11n_addba_req

				  *cmd_addba_req)

{

	struct host_cmd_ds_11n_addba_rsp *add_ba_rsp =

		(struct host_cmd_ds_11n_addba_rsp *)

		&cmd->params.add_ba_rsp;

	struct host_cmd_ds_11n_addba_req *cmd_addba_req =

		(struct host_cmd_ds_11n_addba_req *) data_buf;

	u8 tid;

	int win_size;

	uint16_t block_ack_param_set;

drivers/net/wireless/mwifiex/11n_rxreorder.h

+3 −2
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ int mwifiex_ret_11n_addba_resp(struct mwifiex_private *priv, 
int mwifiex_cmd_11n_delba(struct host_cmd_ds_command *cmd,

			  void *data_buf);

int mwifiex_cmd_11n_addba_rsp_gen(struct mwifiex_private *priv,

				  struct host_cmd_ds_command

				  *cmd, void *data_buf);

				  struct host_cmd_ds_command *cmd,

				  struct host_cmd_ds_11n_addba_req

				  *cmd_addba_req);

int mwifiex_cmd_11n_addba_req(struct host_cmd_ds_command *cmd,

			      void *data_buf);

void mwifiex_11n_cleanup_reorder_tbl(struct mwifiex_private *priv);

drivers/net/wireless/mwifiex/cmdevt.c

+11 −17
Original line number Diff line number Diff line
@@ -104,13 +104,11 @@ mwifiex_clean_cmd_node(struct mwifiex_adapter *adapter, 
 * main thread.

 */

static int mwifiex_cmd_host_cmd(struct mwifiex_private *priv,

				struct host_cmd_ds_command *cmd, void *data_buf)

				struct host_cmd_ds_command *cmd,

				struct mwifiex_ds_misc_cmd *pcmd_ptr)

{

	struct mwifiex_ds_misc_cmd *pcmd_ptr =

		(struct mwifiex_ds_misc_cmd *) data_buf;



	/* Copy the HOST command to command buffer */

	memcpy((void *) cmd, pcmd_ptr->cmd, pcmd_ptr->len);

	memcpy(cmd, pcmd_ptr->cmd, pcmd_ptr->len);

	dev_dbg(priv->adapter->dev, "cmd: host cmd size = %d\n", pcmd_ptr->len);

	return 0;

}
@@ -707,15 +705,14 @@ int mwifiex_process_cmdresp(struct mwifiex_adapter *adapter) 


	if (adapter->curr_cmd->cmd_flag & CMD_F_HOSTCMD) {

		/* Copy original response back to response buffer */

		struct mwifiex_ds_misc_cmd *hostcmd = NULL;

		struct mwifiex_ds_misc_cmd *hostcmd;

		uint16_t size = le16_to_cpu(resp->size);

		dev_dbg(adapter->dev, "info: host cmd resp size = %d\n", size);

		size = min_t(u16, size, MWIFIEX_SIZE_OF_CMD_BUFFER);

		if (adapter->curr_cmd->data_buf) {

			hostcmd = (struct mwifiex_ds_misc_cmd *)

						adapter->curr_cmd->data_buf;

			hostcmd = adapter->curr_cmd->data_buf;

			hostcmd->len = size;

			memcpy(hostcmd->cmd, (void *) resp, size);

			memcpy(hostcmd->cmd, resp, size);

		}

	}

	orig_cmdresp_no = le16_to_cpu(resp->command);
@@ -1155,7 +1152,7 @@ EXPORT_SYMBOL_GPL(mwifiex_process_sleep_confirm_resp); 
int mwifiex_cmd_enh_power_mode(struct mwifiex_private *priv,

			       struct host_cmd_ds_command *cmd,

			       u16 cmd_action, uint16_t ps_bitmap,

			       void *data_buf)

			       struct mwifiex_ds_auto_ds *auto_ds)

{

	struct host_cmd_ds_802_11_ps_mode_enh *psmode_enh =

		&cmd->params.psmode_enh;
@@ -1218,9 +1215,8 @@ int mwifiex_cmd_enh_power_mode(struct mwifiex_private *priv, 
					sizeof(struct mwifiex_ie_types_header));

			cmd_size += sizeof(*auto_ds_tlv);

			tlv += sizeof(*auto_ds_tlv);

			if (data_buf)

				idletime = ((struct mwifiex_ds_auto_ds *)

					     data_buf)->idle_time;

			if (auto_ds)

				idletime = auto_ds->idle_time;

			dev_dbg(priv->adapter->dev,

					"cmd: PS Command: Enter Auto Deep Sleep\n");

			auto_ds_tlv->deep_sleep_timeout = cpu_to_le16(idletime);
@@ -1239,7 +1235,7 @@ int mwifiex_cmd_enh_power_mode(struct mwifiex_private *priv, 
 */

int mwifiex_ret_enh_power_mode(struct mwifiex_private *priv,

			       struct host_cmd_ds_command *resp,

			       void *data_buf)

			       struct mwifiex_ds_pm_cfg *pm_cfg)

{

	struct mwifiex_adapter *adapter = priv->adapter;

	struct host_cmd_ds_802_11_ps_mode_enh *ps_mode =
@@ -1282,10 +1278,8 @@ int mwifiex_ret_enh_power_mode(struct mwifiex_private *priv, 


		dev_dbg(adapter->dev, "cmd: ps_bitmap=%#x\n", ps_bitmap);



		if (data_buf) {

		if (pm_cfg) {

			/* This section is for get power save mode */

			struct mwifiex_ds_pm_cfg *pm_cfg =

					(struct mwifiex_ds_pm_cfg *)data_buf;

			if (ps_bitmap & BITMAP_STA_PS)

				pm_cfg->param.ps_mode = 1;

			else