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

Commit f7e6469f authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: remove command and return value from opmode RX 



With the previous patch series, no opmode continues using the
command or handler_status (i.e. the return value from the RX)
so it can be removed now.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 0416841d

drivers/net/wireless/iwlwifi/dvm/agn.h

+2 −3
Original line number Diff line number Diff line
@@ -122,9 +122,8 @@ static inline void iwl_set_calib_hdr(struct iwl_calib_hdr *hdr, u8 cmd) 
void iwl_down(struct iwl_priv *priv);

void iwl_cancel_deferred_work(struct iwl_priv *priv);

void iwlagn_prepare_restart(struct iwl_priv *priv);

int __must_check iwl_rx_dispatch(struct iwl_op_mode *op_mode,

				 struct iwl_rx_cmd_buffer *rxb,

				 struct iwl_device_cmd *cmd);

void iwl_rx_dispatch(struct iwl_op_mode *op_mode,

		     struct iwl_rx_cmd_buffer *rxb);



bool iwl_check_for_ct_kill(struct iwl_priv *priv);

drivers/net/wireless/iwlwifi/dvm/rx.c

+1 −4
Original line number Diff line number Diff line
@@ -1073,8 +1073,7 @@ void iwl_setup_rx_handlers(struct iwl_priv *priv) 
		iwlagn_bt_rx_handler_setup(priv);

}



int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,

		    struct iwl_device_cmd *cmd)

void iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_priv *priv = IWL_OP_MODE_GET_DVM(op_mode);
@@ -1098,6 +1097,4 @@ int iwl_rx_dispatch(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb, 
			     iwl_dvm_get_cmd_string(pkt->hdr.cmd),

			     pkt->hdr.cmd);

	}



	return 0;

}

drivers/net/wireless/iwlwifi/iwl-op-mode.h

+4 −6
Original line number Diff line number Diff line
@@ -148,8 +148,7 @@ struct iwl_op_mode_ops { 
				     const struct iwl_fw *fw,

				     struct dentry *dbgfs_dir);

	void (*stop)(struct iwl_op_mode *op_mode);

	int (*rx)(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb,

		  struct iwl_device_cmd *cmd);

	void (*rx)(struct iwl_op_mode *op_mode, struct iwl_rx_cmd_buffer *rxb);

	void (*napi_add)(struct iwl_op_mode *op_mode,

			 struct napi_struct *napi,

			 struct net_device *napi_dev,
@@ -188,11 +187,10 @@ static inline void iwl_op_mode_stop(struct iwl_op_mode *op_mode) 
	op_mode->ops->stop(op_mode);

}



static inline int iwl_op_mode_rx(struct iwl_op_mode *op_mode,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *cmd)

static inline void iwl_op_mode_rx(struct iwl_op_mode *op_mode,

				  struct iwl_rx_cmd_buffer *rxb)

{

	return op_mode->ops->rx(op_mode, rxb, cmd);

	return op_mode->ops->rx(op_mode, rxb);

}



static inline void iwl_op_mode_queue_full(struct iwl_op_mode *op_mode,

drivers/net/wireless/iwlwifi/iwl-trans.h

+0 −3
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ enum iwl_hcmd_dataflag { 
 * @resp_pkt: response packet, if %CMD_WANT_SKB was set

 * @_rx_page_order: (internally used to free response packet)

 * @_rx_page_addr: (internally used to free response packet)

 * @handler_status: return value of the handler of the command

 *	(put in setup_rx_handlers) - valid for SYNC mode only

 * @flags: can be CMD_*

 * @len: array of the lengths of the chunks in data

 * @dataflags: IWL_HCMD_DFL_*
@@ -273,7 +271,6 @@ struct iwl_host_cmd { 
	struct iwl_rx_packet *resp_pkt;

	unsigned long _rx_page_addr;

	u32 _rx_page_order;

	int handler_status;



	u32 flags;

	u16 len[IWL_MAX_CMD_TBS_PER_TFD];

drivers/net/wireless/iwlwifi/mvm/ops.c

+5 −8
Original line number Diff line number Diff line
@@ -703,9 +703,8 @@ static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm, 
	}

}



static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode,

			       struct iwl_rx_cmd_buffer *rxb,

			       struct iwl_device_cmd *cmd)

static void iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode,

				struct iwl_rx_cmd_buffer *rxb)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
@@ -713,7 +712,7 @@ static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode, 


	if (likely(pkt->hdr.cmd == REPLY_RX_MPDU_CMD)) {

		iwl_mvm_rx_rx_mpdu(mvm, rxb);

		return 0;

		return;

	}



	iwl_mvm_rx_check_trigger(mvm, pkt);
@@ -734,13 +733,13 @@ static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode, 


		if (!rx_h->async) {

			rx_h->fn(mvm, rxb);

			return 0;

			return;

		}



		entry = kzalloc(sizeof(*entry), GFP_ATOMIC);

		/* we can't do much... */

		if (!entry)

			return 0;

			return;



		entry->rxb._page = rxb_steal_page(rxb);

		entry->rxb._offset = rxb->_offset;
@@ -752,8 +751,6 @@ static int iwl_mvm_rx_dispatch(struct iwl_op_mode *op_mode, 
		schedule_work(&mvm->async_handlers_wk);

		break;

	}



	return 0;

}



static void iwl_mvm_stop_sw_queue(struct iwl_op_mode *op_mode, int queue)