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

Commit 41874d3a authored by Shahar S Matityahu's avatar Shahar S Matityahu Committed by Luca Coelho
Browse files

iwlwifi: dbg_ini: align dbg tlv functions names to a single format 



align the naming to iwl_dbg_tlv_*

Signed-off-by: default avatarShahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent b5baefda

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c

+10 −10
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include "iwl-trans.h"

#include "iwl-dbg-tlv.h"



void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,

void iwl_dbg_tlv_copy(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,

		      bool ext)

{

	struct iwl_apply_point_data *data;
@@ -106,7 +106,7 @@ void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv, 
	data->offset += offset_size;

}



void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data,

void iwl_dbg_tlv_alloc(struct iwl_trans *trans, size_t len, const u8 *data,

		       bool ext)

{

	struct iwl_ucode_tlv *tlv;
@@ -183,7 +183,7 @@ void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data, 
	}

}



void iwl_fw_dbg_free(struct iwl_trans *trans)

void iwl_dbg_tlv_free(struct iwl_trans *trans)

{

	int i;
@@ -198,7 +198,7 @@ void iwl_fw_dbg_free(struct iwl_trans *trans) 
	}

}



static int iwl_parse_fw_dbg_tlv(struct iwl_trans *trans, const u8 *data,

static int iwl_dbg_tlv_parse_bin(struct iwl_trans *trans, const u8 *data,

				 size_t len)

{

	struct iwl_ucode_tlv *tlv;
@@ -227,7 +227,7 @@ static int iwl_parse_fw_dbg_tlv(struct iwl_trans *trans, const u8 *data, 
		case IWL_UCODE_TLV_TYPE_REGIONS:

		case IWL_UCODE_TLV_TYPE_TRIGGERS:

		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:

			iwl_fw_dbg_copy_tlv(trans, tlv, true);

			iwl_dbg_tlv_copy(trans, tlv, true);

			break;

		default:

			WARN_ONCE(1, "Invalid TLV %x\n", tlv_type);
@@ -238,7 +238,7 @@ static int iwl_parse_fw_dbg_tlv(struct iwl_trans *trans, const u8 *data, 
	return 0;

}



void iwl_load_fw_dbg_tlv(struct device *dev, struct iwl_trans *trans)

void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans)

{

	const struct firmware *fw;

	int res;
@@ -250,8 +250,8 @@ void iwl_load_fw_dbg_tlv(struct device *dev, struct iwl_trans *trans) 
	if (res)

		return;



	iwl_alloc_dbg_tlv(trans, fw->size, fw->data, true);

	iwl_parse_fw_dbg_tlv(trans, fw->data, fw->size);

	iwl_dbg_tlv_alloc(trans, fw->size, fw->data, true);

	iwl_dbg_tlv_parse_bin(trans, fw->data, fw->size);



	trans->dbg.external_ini_loaded = true;

	release_firmware(fw);

drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h

+7 −7
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018 - 2019 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,7 +28,7 @@ 
 *

 * BSD LICENSE

 *

 * Copyright (C) 2018 Intel Corporation

 * Copyright (C) 2018 - 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -77,11 +77,11 @@ struct iwl_apply_point_data { 
};



struct iwl_trans;

void iwl_load_fw_dbg_tlv(struct device *dev, struct iwl_trans *trans);

void iwl_fw_dbg_free(struct iwl_trans *trans);

void iwl_fw_dbg_copy_tlv(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,

void iwl_dbg_tlv_load_bin(struct device *dev, struct iwl_trans *trans);

void iwl_dbg_tlv_free(struct iwl_trans *trans);

void iwl_dbg_tlv_copy(struct iwl_trans *trans, struct iwl_ucode_tlv *tlv,

		      bool ext);

void iwl_alloc_dbg_tlv(struct iwl_trans *trans, size_t len, const u8 *data,

void iwl_dbg_tlv_alloc(struct iwl_trans *trans, size_t len, const u8 *data,

		       bool ext);



#endif /* __iwl_dbg_tlv_h__*/

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+5 −5
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
	len -= sizeof(*ucode);



	if (iwlwifi_mod_params.enable_ini)

		iwl_alloc_dbg_tlv(drv->trans, len, data, false);

		iwl_dbg_tlv_alloc(drv->trans, len, data, false);



	while (len >= sizeof(*tlv)) {

		len -= sizeof(*tlv);
@@ -1156,7 +1156,7 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
		case IWL_UCODE_TLV_TYPE_TRIGGERS:

		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:

			if (iwlwifi_mod_params.enable_ini)

				iwl_fw_dbg_copy_tlv(drv->trans, tlv, false);

				iwl_dbg_tlv_copy(drv->trans, tlv, false);

			break;

		case IWL_UCODE_TLV_CMD_VERSIONS:

			if (tlv_len % sizeof(struct iwl_fw_cmd_version)) {
@@ -1640,7 +1640,7 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) 
	init_completion(&drv->request_firmware_complete);

	INIT_LIST_HEAD(&drv->list);



	iwl_load_fw_dbg_tlv(drv->trans->dev, drv->trans);

	iwl_dbg_tlv_load_bin(drv->trans->dev, drv->trans);



#ifdef CONFIG_IWLWIFI_DEBUGFS

	/* Create the device debugfs entries. */
@@ -1662,8 +1662,8 @@ struct iwl_drv *iwl_drv_start(struct iwl_trans *trans) 
err_fw:

#ifdef CONFIG_IWLWIFI_DEBUGFS

	debugfs_remove_recursive(drv->dbgfs_drv);

	iwl_dbg_tlv_free(drv->trans);

#endif

	iwl_fw_dbg_free(drv->trans);

	kfree(drv);

err:

	return ERR_PTR(ret);
@@ -1693,7 +1693,7 @@ void iwl_drv_stop(struct iwl_drv *drv) 
	debugfs_remove_recursive(drv->dbgfs_drv);

#endif



	iwl_fw_dbg_free(drv->trans);

	iwl_dbg_tlv_free(drv->trans);



	kfree(drv);

}