Skip to content

L
linux
Commit fa99e963 authored by Kalle Valo's avatar Kalle Valo
Browse files
Options

ath6kl: use ath6kl prefix in credit functions 

This is to follow the common style in the driver. Also add braces to
fix a style issue.
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a9ab6ccf
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
drivers/net/wireless/ath/ath6kl/common.h
View file @ fa99e963
...@@ -78,16 +78,16 @@ struct ath6kl; ...@@ -78,16 +78,16 @@ struct ath6kl;
enum htc_credit_dist_reason; enum htc_credit_dist_reason;
struct htc_credit_state_info; struct htc_credit_state_info;
int ath6k_setup_credit_dist(void *htc_handle, int ath6kl_setup_credit_dist(void *htc_handle,
struct htc_credit_state_info *cred_info); struct htc_credit_state_info *cred_info);
void ath6k_credit_distribute(struct htc_credit_state_info *cred_inf, void ath6kl_credit_distribute(struct htc_credit_state_info *cred_inf,
struct list_head *epdist_list, struct list_head *epdist_list,
enum htc_credit_dist_reason reason); enum htc_credit_dist_reason reason);
void ath6k_credit_init(struct htc_credit_state_info *cred_inf, void ath6kl_credit_init(struct htc_credit_state_info *cred_inf,
struct list_head *ep_list, struct list_head *ep_list,
int tot_credits); int tot_credits);
void ath6k_seek_credits(struct htc_credit_state_info *cred_inf, void ath6kl_seek_credits(struct htc_credit_state_info *cred_inf,
struct htc_endpoint_credit_dist *ep_dist); struct htc_endpoint_credit_dist *ep_dist);
struct ath6kl *ath6kl_core_alloc(struct device *sdev); struct ath6kl *ath6kl_core_alloc(struct device *sdev);
int ath6kl_core_init(struct ath6kl *ar); int ath6kl_core_init(struct ath6kl *ar);
void ath6kl_core_cleanup(struct ath6kl *ar); void ath6kl_core_cleanup(struct ath6kl *ar);
......
drivers/net/wireless/ath/ath6kl/htc.c
View file @ fa99e963
...@@ -105,7 +105,7 @@ static void htc_tx_comp_update(struct htc_target *target, ...@@ -105,7 +105,7 @@ static void htc_tx_comp_update(struct htc_target *target,
ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx ctxt 0x%p dist 0x%p\n", ath6kl_dbg(ATH6KL_DBG_HTC, "htc tx ctxt 0x%p dist 0x%p\n",
target->cred_dist_cntxt, &target->cred_dist_list); target->cred_dist_cntxt, &target->cred_dist_list);
ath6k_credit_distribute(target->cred_dist_cntxt, ath6kl_credit_distribute(target->cred_dist_cntxt,
&target->cred_dist_list, &target->cred_dist_list,
HTC_CREDIT_DIST_SEND_COMPLETE); HTC_CREDIT_DIST_SEND_COMPLETE);
...@@ -237,7 +237,7 @@ static int htc_check_credits(struct htc_target *target, ...@@ -237,7 +237,7 @@ static int htc_check_credits(struct htc_target *target,
ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n", ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n",
target->cred_dist_cntxt, &ep->cred_dist); target->cred_dist_cntxt, &ep->cred_dist);
ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist); ath6kl_seek_credits(target->cred_dist_cntxt, &ep->cred_dist);
ep->cred_dist.seek_cred = 0; ep->cred_dist.seek_cred = 0;
...@@ -260,7 +260,7 @@ static int htc_check_credits(struct htc_target *target, ...@@ -260,7 +260,7 @@ static int htc_check_credits(struct htc_target *target,
ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n", ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n",
target->cred_dist_cntxt, &ep->cred_dist); target->cred_dist_cntxt, &ep->cred_dist);
ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist); ath6kl_seek_credits(target->cred_dist_cntxt, &ep->cred_dist);
/* see if we were successful in getting more */ /* see if we were successful in getting more */
if (ep->cred_dist.credits < ep->cred_dist.cred_per_msg) { if (ep->cred_dist.credits < ep->cred_dist.cred_per_msg) {
...@@ -842,9 +842,9 @@ void ath6kl_htc_indicate_activity_change(struct htc_target *target, ...@@ -842,9 +842,9 @@ void ath6kl_htc_indicate_activity_change(struct htc_target *target,
"htc tx activity ctxt 0x%p dist 0x%p\n", "htc tx activity ctxt 0x%p dist 0x%p\n",
target->cred_dist_cntxt, &target->cred_dist_list); target->cred_dist_cntxt, &target->cred_dist_list);
ath6k_credit_distribute(target->cred_dist_cntxt, ath6kl_credit_distribute(target->cred_dist_cntxt,
&target->cred_dist_list, &target->cred_dist_list,
HTC_CREDIT_DIST_ACTIVITY_CHANGE); HTC_CREDIT_DIST_ACTIVITY_CHANGE);
} }
spin_unlock_bh(&target->tx_lock); spin_unlock_bh(&target->tx_lock);
...@@ -1272,9 +1272,9 @@ static void htc_proc_cred_rpt(struct htc_target *target, ...@@ -1272,9 +1272,9 @@ static void htc_proc_cred_rpt(struct htc_target *target,
ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n", ath6kl_dbg(ATH6KL_DBG_HTC, "htc creds ctxt 0x%p dist 0x%p\n",
target->cred_dist_cntxt, &target->cred_dist_list); target->cred_dist_cntxt, &target->cred_dist_list);
ath6k_credit_distribute(target->cred_dist_cntxt, ath6kl_credit_distribute(target->cred_dist_cntxt,
&target->cred_dist_list, &target->cred_dist_list,
HTC_CREDIT_DIST_SEND_COMPLETE); HTC_CREDIT_DIST_SEND_COMPLETE);
} }
spin_unlock_bh(&target->tx_lock); spin_unlock_bh(&target->tx_lock);
...@@ -2338,8 +2338,8 @@ int ath6kl_htc_start(struct htc_target *target) ...@@ -2338,8 +2338,8 @@ int ath6kl_htc_start(struct htc_target *target)
} }
/* NOTE: the first entry in the distribution list is ENDPOINT_0 */ /* NOTE: the first entry in the distribution list is ENDPOINT_0 */
ath6k_credit_init(target->cred_dist_cntxt, &target->cred_dist_list, ath6kl_credit_init(target->cred_dist_cntxt, &target->cred_dist_list,
target->tgt_creds); target->tgt_creds);
dump_cred_dist_stats(target); dump_cred_dist_stats(target);
......
drivers/net/wireless/ath/ath6kl/init.c
View file @ fa99e963
...@@ -1506,7 +1506,7 @@ static int ath6kl_init(struct ath6kl *ar) ...@@ -1506,7 +1506,7 @@ static int ath6kl_init(struct ath6kl *ar)
ath6kl_refill_amsdu_rxbufs(ar, ATH6KL_MAX_AMSDU_RX_BUFFERS); ath6kl_refill_amsdu_rxbufs(ar, ATH6KL_MAX_AMSDU_RX_BUFFERS);
/* setup credit distribution */ /* setup credit distribution */
ath6k_setup_credit_dist(ar->htc_target, &ar->credit_state_info); ath6kl_setup_credit_dist(ar->htc_target, &ar->credit_state_info);
ath6kl_cookie_init(ar); ath6kl_cookie_init(ar);
......
drivers/net/wireless/ath/ath6kl/main.c
View file @ fa99e963
...@@ -556,9 +556,9 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr, ...@@ -556,9 +556,9 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr,
} }
/* Functions for Tx credit handling */ /* Functions for Tx credit handling */
void ath6k_credit_init(struct htc_credit_state_info *cred_info, void ath6kl_credit_init(struct htc_credit_state_info *cred_info,
struct list_head *ep_list, struct list_head *ep_list,
int tot_credits) int tot_credits)
{ {
struct htc_endpoint_credit_dist *cur_ep_dist; struct htc_endpoint_credit_dist *cur_ep_dist;
int count; int count;
...@@ -572,7 +572,7 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info, ...@@ -572,7 +572,7 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info,
cur_ep_dist->cred_min = cur_ep_dist->cred_per_msg; cur_ep_dist->cred_min = cur_ep_dist->cred_per_msg;
if (tot_credits > 4) if (tot_credits > 4) {
if ((cur_ep_dist->svc_id == WMI_DATA_BK_SVC) || if ((cur_ep_dist->svc_id == WMI_DATA_BK_SVC) ||
(cur_ep_dist->svc_id == WMI_DATA_BE_SVC)) { (cur_ep_dist->svc_id == WMI_DATA_BE_SVC)) {
ath6kl_deposit_credit_to_ep(cred_info, ath6kl_deposit_credit_to_ep(cred_info,
...@@ -580,6 +580,7 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info, ...@@ -580,6 +580,7 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info,
cur_ep_dist->cred_min); cur_ep_dist->cred_min);
cur_ep_dist->dist_flags |= HTC_EP_ACTIVE; cur_ep_dist->dist_flags |= HTC_EP_ACTIVE;
} }
}
if (cur_ep_dist->svc_id == WMI_CONTROL_SVC) { if (cur_ep_dist->svc_id == WMI_CONTROL_SVC) {
ath6kl_deposit_credit_to_ep(cred_info, cur_ep_dist, ath6kl_deposit_credit_to_ep(cred_info, cur_ep_dist,
...@@ -634,8 +635,8 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info, ...@@ -634,8 +635,8 @@ void ath6k_credit_init(struct htc_credit_state_info *cred_info,
} }
/* initialize and setup credit distribution */ /* initialize and setup credit distribution */
int ath6k_setup_credit_dist(void *htc_handle, int ath6kl_setup_credit_dist(void *htc_handle,
struct htc_credit_state_info *cred_info) struct htc_credit_state_info *cred_info)
{ {
u16 servicepriority[5]; u16 servicepriority[5];
...@@ -654,9 +655,9 @@ int ath6k_setup_credit_dist(void *htc_handle, ...@@ -654,9 +655,9 @@ int ath6k_setup_credit_dist(void *htc_handle,
} }
/* reduce an ep's credits back to a set limit */ /* reduce an ep's credits back to a set limit */
static void ath6k_reduce_credits(struct htc_credit_state_info *cred_info, static void ath6kl_reduce_credits(struct htc_credit_state_info *cred_info,
struct htc_endpoint_credit_dist *ep_dist, struct htc_endpoint_credit_dist *ep_dist,
int limit) int limit)
{ {
int credits; int credits;
...@@ -670,8 +671,8 @@ static void ath6k_reduce_credits(struct htc_credit_state_info *cred_info, ...@@ -670,8 +671,8 @@ static void ath6k_reduce_credits(struct htc_credit_state_info *cred_info,
cred_info->cur_free_credits += credits; cred_info->cur_free_credits += credits;
} }
static void ath6k_credit_update(struct htc_credit_state_info *cred_info, static void ath6kl_credit_update(struct htc_credit_state_info *cred_info,
struct list_head *epdist_list) struct list_head *epdist_list)
{ {
struct htc_endpoint_credit_dist *cur_dist_list; struct htc_endpoint_credit_dist *cur_dist_list;
...@@ -685,19 +686,19 @@ static void ath6k_credit_update(struct htc_credit_state_info *cred_info, ...@@ -685,19 +686,19 @@ static void ath6k_credit_update(struct htc_credit_state_info *cred_info,
cur_dist_list->cred_to_dist = 0; cur_dist_list->cred_to_dist = 0;
if (cur_dist_list->credits > if (cur_dist_list->credits >
cur_dist_list->cred_assngd) cur_dist_list->cred_assngd)
ath6k_reduce_credits(cred_info, ath6kl_reduce_credits(cred_info,
cur_dist_list, cur_dist_list,
cur_dist_list->cred_assngd); cur_dist_list->cred_assngd);
if (cur_dist_list->credits > if (cur_dist_list->credits >
cur_dist_list->cred_norm) cur_dist_list->cred_norm)
ath6k_reduce_credits(cred_info, cur_dist_list, ath6kl_reduce_credits(cred_info, cur_dist_list,
cur_dist_list->cred_norm); cur_dist_list->cred_norm);
if (!(cur_dist_list->dist_flags & HTC_EP_ACTIVE)) { if (!(cur_dist_list->dist_flags & HTC_EP_ACTIVE)) {
if (cur_dist_list->txq_depth == 0) if (cur_dist_list->txq_depth == 0)
ath6k_reduce_credits(cred_info, ath6kl_reduce_credits(cred_info,
cur_dist_list, 0); cur_dist_list, 0);
} }
} }
} }
...@@ -707,8 +708,8 @@ static void ath6k_credit_update(struct htc_credit_state_info *cred_info, ...@@ -707,8 +708,8 @@ static void ath6k_credit_update(struct htc_credit_state_info *cred_info,
* HTC has an endpoint that needs credits, ep_dist is the endpoint in * HTC has an endpoint that needs credits, ep_dist is the endpoint in
* question. * question.
*/ */
void ath6k_seek_credits(struct htc_credit_state_info *cred_info, void ath6kl_seek_credits(struct htc_credit_state_info *cred_info,
struct htc_endpoint_credit_dist *ep_dist) struct htc_endpoint_credit_dist *ep_dist)
{ {
struct htc_endpoint_credit_dist *curdist_list; struct htc_endpoint_credit_dist *curdist_list;
int credits = 0; int credits = 0;
...@@ -760,8 +761,8 @@ void ath6k_seek_credits(struct htc_credit_state_info *cred_info, ...@@ -760,8 +761,8 @@ void ath6k_seek_credits(struct htc_credit_state_info *cred_info,
* above it's minimum to fulfill our need try to * above it's minimum to fulfill our need try to
* take away just enough to fulfill our need. * take away just enough to fulfill our need.
*/ */
ath6k_reduce_credits(cred_info, curdist_list, ath6kl_reduce_credits(cred_info, curdist_list,
curdist_list->cred_assngd - need); curdist_list->cred_assngd - need);
if (cred_info->cur_free_credits >= if (cred_info->cur_free_credits >=
ep_dist->seek_cred) ep_dist->seek_cred)
...@@ -783,8 +784,8 @@ void ath6k_seek_credits(struct htc_credit_state_info *cred_info, ...@@ -783,8 +784,8 @@ void ath6k_seek_credits(struct htc_credit_state_info *cred_info,
} }
/* redistribute credits based on activity change */ /* redistribute credits based on activity change */
static void ath6k_redistribute_credits(struct htc_credit_state_info *info, static void ath6kl_redistribute_credits(struct htc_credit_state_info *info,
struct list_head *ep_dist_list) struct list_head *ep_dist_list)
{ {
struct htc_endpoint_credit_dist *curdist_list; struct htc_endpoint_credit_dist *curdist_list;
...@@ -799,10 +800,9 @@ static void ath6k_redistribute_credits(struct htc_credit_state_info *info, ...@@ -799,10 +800,9 @@ static void ath6k_redistribute_credits(struct htc_credit_state_info *info,
if ((curdist_list->svc_id != WMI_CONTROL_SVC) && if ((curdist_list->svc_id != WMI_CONTROL_SVC) &&
!(curdist_list->dist_flags & HTC_EP_ACTIVE)) { !(curdist_list->dist_flags & HTC_EP_ACTIVE)) {
if (curdist_list->txq_depth == 0) if (curdist_list->txq_depth == 0)
ath6k_reduce_credits(info, ath6kl_reduce_credits(info, curdist_list, 0);
curdist_list, 0);
else else
ath6k_reduce_credits(info, ath6kl_reduce_credits(info,
curdist_list, curdist_list,
curdist_list->cred_min); curdist_list->cred_min);
} }
...@@ -817,16 +817,16 @@ static void ath6k_redistribute_credits(struct htc_credit_state_info *info, ...@@ -817,16 +817,16 @@ static void ath6k_redistribute_credits(struct htc_credit_state_info *info,
* structures in prioritized order as defined by the call to the * structures in prioritized order as defined by the call to the
* htc_set_credit_dist() api. * htc_set_credit_dist() api.
*/ */
void ath6k_credit_distribute(struct htc_credit_state_info *cred_info, void ath6kl_credit_distribute(struct htc_credit_state_info *cred_info,
struct list_head *ep_dist_list, struct list_head *ep_dist_list,
enum htc_credit_dist_reason reason) enum htc_credit_dist_reason reason)
{ {
switch (reason) { switch (reason) {
case HTC_CREDIT_DIST_SEND_COMPLETE: case HTC_CREDIT_DIST_SEND_COMPLETE:
ath6k_credit_update(cred_info, ep_dist_list); ath6kl_credit_update(cred_info, ep_dist_list);
break; break;
case HTC_CREDIT_DIST_ACTIVITY_CHANGE: case HTC_CREDIT_DIST_ACTIVITY_CHANGE:
ath6k_redistribute_credits(cred_info, ep_dist_list); ath6kl_redistribute_credits(cred_info, ep_dist_list);
break; break;
default: default:
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7