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

Commit b79b9baa authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: relocate wmi attach/deatch functions 



Init functions should be placed at the end of
files in most cases to avoid forward declarations
for static functions.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent cf9fca8f

drivers/net/wireless/ath/ath10k/wmi.c

+38 −39
Original line number Diff line number Diff line
@@ -2780,45 +2780,6 @@ static void ath10k_wmi_process_rx(struct ath10k *ar, struct sk_buff *skb) 
	}

}



/* WMI Initialization functions */

int ath10k_wmi_attach(struct ath10k *ar)

{

	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {

		if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))

			ar->wmi.cmd = &wmi_10_2_cmd_map;

		else

			ar->wmi.cmd = &wmi_10x_cmd_map;



		ar->wmi.vdev_param = &wmi_10x_vdev_param_map;

		ar->wmi.pdev_param = &wmi_10x_pdev_param_map;

	} else {

		ar->wmi.cmd = &wmi_cmd_map;

		ar->wmi.vdev_param = &wmi_vdev_param_map;

		ar->wmi.pdev_param = &wmi_pdev_param_map;

	}



	init_completion(&ar->wmi.service_ready);

	init_completion(&ar->wmi.unified_ready);

	init_waitqueue_head(&ar->wmi.tx_credits_wq);



	return 0;

}



void ath10k_wmi_detach(struct ath10k *ar)

{

	int i;



	/* free the host memory chunks requested by firmware */

	for (i = 0; i < ar->wmi.num_mem_chunks; i++) {

		dma_free_coherent(ar->dev,

				  ar->wmi.mem_chunks[i].len,

				  ar->wmi.mem_chunks[i].vaddr,

				  ar->wmi.mem_chunks[i].paddr);

	}



	ar->wmi.num_mem_chunks = 0;

}



int ath10k_wmi_connect(struct ath10k *ar)

{

	int status;
@@ -4187,3 +4148,41 @@ int ath10k_wmi_dbglog_cfg(struct ath10k *ar, u32 module_enable) 


	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->dbglog_cfg_cmdid);

}



int ath10k_wmi_attach(struct ath10k *ar)

{

	if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {

		if (test_bit(ATH10K_FW_FEATURE_WMI_10_2, ar->fw_features))

			ar->wmi.cmd = &wmi_10_2_cmd_map;

		else

			ar->wmi.cmd = &wmi_10x_cmd_map;



		ar->wmi.vdev_param = &wmi_10x_vdev_param_map;

		ar->wmi.pdev_param = &wmi_10x_pdev_param_map;

	} else {

		ar->wmi.cmd = &wmi_cmd_map;

		ar->wmi.vdev_param = &wmi_vdev_param_map;

		ar->wmi.pdev_param = &wmi_pdev_param_map;

	}



	init_completion(&ar->wmi.service_ready);

	init_completion(&ar->wmi.unified_ready);

	init_waitqueue_head(&ar->wmi.tx_credits_wq);



	return 0;

}



void ath10k_wmi_detach(struct ath10k *ar)

{

	int i;



	/* free the host memory chunks requested by firmware */

	for (i = 0; i < ar->wmi.num_mem_chunks; i++) {

		dma_free_coherent(ar->dev,

				  ar->wmi.mem_chunks[i].len,

				  ar->wmi.mem_chunks[i].vaddr,

				  ar->wmi.mem_chunks[i].paddr);

	}



	ar->wmi.num_mem_chunks = 0;

}