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

Commit ede615d2 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Refactor ath6kl_init_hw_start() and ath6kl_init_hw_stop() 



So that these functions will be used to re-initialize the fw
upon detecting fw error. This refactoring moves ar->state
setting out of core stop/start functionality.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 83685091

drivers/net/wireless/ath/ath6kl/init.c

+23 −5
Original line number Diff line number Diff line
@@ -1546,7 +1546,7 @@ static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) 
	return NULL;

}



int ath6kl_init_hw_start(struct ath6kl *ar)

static int __ath6kl_init_hw_start(struct ath6kl *ar)

{

	long timeleft;

	int ret, i;
@@ -1642,8 +1642,6 @@ int ath6kl_init_hw_start(struct ath6kl *ar) 
			goto err_htc_stop;

	}



	ar->state = ATH6KL_STATE_ON;



	return 0;



err_htc_stop:
@@ -1656,7 +1654,18 @@ int ath6kl_init_hw_start(struct ath6kl *ar) 
	return ret;

}



int ath6kl_init_hw_stop(struct ath6kl *ar)

int ath6kl_init_hw_start(struct ath6kl *ar)

{

	int err;



	err = __ath6kl_init_hw_start(ar);

	if (err)

		return err;

	ar->state = ATH6KL_STATE_ON;

	return 0;

}



static int __ath6kl_init_hw_stop(struct ath6kl *ar)

{

	int ret;
@@ -1672,8 +1681,17 @@ int ath6kl_init_hw_stop(struct ath6kl *ar) 
	if (ret)

		ath6kl_warn("failed to power off hif: %d\n", ret);



	ar->state = ATH6KL_STATE_OFF;

	return 0;

}



int ath6kl_init_hw_stop(struct ath6kl *ar)

{

	int err;



	err = __ath6kl_init_hw_stop(ar);

	if (err)

		return err;

	ar->state = ATH6KL_STATE_OFF;

	return 0;

}