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

Commit 9eea5689 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Kalle Valo
Browse files

ath10k: harmonize error case handling in ath10k_core_start 



All of the bringup/init functions called in ath10k_core_start return 0
on success and != 0 on failure. ath10k_wmi_wait_for_service_ready(),
ath10k_wmi_wait_for_unified_ready() and their call sites were adjusted
to fit this model.
The return type of wait_for_completion_timeout is unsigned long not int so
ath10k_wmi_wait_for_service_ready() and ath10k_wmi_wait_for_unified_ready()
were fixed up accordingly.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a7a42849

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

+2 −4
Original line number Diff line number Diff line
@@ -1123,9 +1123,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode) 


	if (mode == ATH10K_FIRMWARE_MODE_NORMAL) {

		status = ath10k_wmi_wait_for_service_ready(ar);

		if (status <= 0) {

		if (status) {

			ath10k_warn(ar, "wmi service ready event not received");

			status = -ETIMEDOUT;

			goto err_hif_stop;

		}

	}
@@ -1141,9 +1140,8 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode) 
	}



	status = ath10k_wmi_wait_for_unified_ready(ar);

	if (status <= 0) {

	if (status) {

		ath10k_err(ar, "wmi unified ready event not received\n");

		status = -ETIMEDOUT;

		goto err_hif_stop;

	}

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

+12 −8
Original line number Diff line number Diff line
@@ -885,20 +885,24 @@ void ath10k_wmi_put_wmi_channel(struct wmi_channel *ch, 


int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)

{

	int ret;

	unsigned long time_left;



	ret = wait_for_completion_timeout(&ar->wmi.service_ready,

	time_left = wait_for_completion_timeout(&ar->wmi.service_ready,

						WMI_SERVICE_READY_TIMEOUT_HZ);

	return ret;

	if (!time_left)

		return -ETIMEDOUT;

	return 0;

}



int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)

{

	int ret;

	unsigned long time_left;



	ret = wait_for_completion_timeout(&ar->wmi.unified_ready,

	time_left = wait_for_completion_timeout(&ar->wmi.unified_ready,

						WMI_UNIFIED_READY_TIMEOUT_HZ);

	return ret;

	if (!time_left)

		return -ETIMEDOUT;

	return 0;

}



struct sk_buff *ath10k_wmi_alloc_skb(struct ath10k *ar, u32 len)