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

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

iwlwifi: s/iwl_read_targ_mem_words/iwl_read_targ_mem_bytes 



This macro gets the bufsize in bytes.

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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -406,7 +406,7 @@ static void iwl_continuous_event_trace(struct iwl_priv *priv) 




	base = priv->device_pointers.log_event_table;

	base = priv->device_pointers.log_event_table;

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

	if (iwlagn_hw_valid_rtc_data_addr(base)) {

		iwl_read_targ_mem_words(priv->trans, base, &read, sizeof(read));

		iwl_read_targ_mem_bytes(priv->trans, base, &read, sizeof(read));

		capacity = read.capacity;

		capacity = read.capacity;

		mode = read.mode;

		mode = read.mode;

		num_wraps = read.wrap_counter;

		num_wraps = read.wrap_counter;
@@ -1671,7 +1671,7 @@ static void iwl_dump_nic_error_log(struct iwl_priv *priv) 
	}

	}





	/*TODO: Update dbgfs with ISR error stats obtained below */

	/*TODO: Update dbgfs with ISR error stats obtained below */

	iwl_read_targ_mem_words(trans, base, &table, sizeof(table));

	iwl_read_targ_mem_bytes(trans, base, &table, sizeof(table));





	if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {

	if (ERROR_START_OFFSET <= table.valid * ERROR_ELEM_SIZE) {

		IWL_ERR(trans, "Start IWL Error Log Dump:\n");

		IWL_ERR(trans, "Start IWL Error Log Dump:\n");

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ void iwl_clear_bits_prph(struct iwl_trans *trans, u32 reg, u32 mask); 
void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,

void _iwl_read_targ_mem_words(struct iwl_trans *trans, u32 addr,

			      void *buf, int words);

			      void *buf, int words);





#define iwl_read_targ_mem_words(trans, addr, buf, bufsize)	\

#define iwl_read_targ_mem_bytes(trans, addr, buf, bufsize)	\

	do {							\

	do {							\

		BUILD_BUG_ON((bufsize) % sizeof(u32));		\

		BUILD_BUG_ON((bufsize) % sizeof(u32));		\

		_iwl_read_targ_mem_words(trans, addr, buf,	\

		_iwl_read_targ_mem_words(trans, addr, buf,	\