ATH10K Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
	"ath10k@lists.infradead.org" <ath10k@lists.infradead.org>
Subject: Re: [PATCH 6/9] ath10k: deduplicate wmi service ready logic
Date: Mon, 22 Sep 2014 12:46:35 +0300	[thread overview]
Message-ID: <87oau8m1hg.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <CA+BoTQmsVqvGgu_fUqKGqhEKXV7E_w0KdcH_GFoPhAvyjtVdDA@mail.gmail.com> (Michal Kazior's message of "Fri, 19 Sep 2014 10:43:25 +0200")

Michal Kazior <michal.kazior@tieto.com> writes:

> On 19 September 2014 10:37, Kalle Valo <kvalo@qca.qualcomm.com> wrote:
>> Michal Kazior <michal.kazior@tieto.com> writes:
>>
>>> +     if (test_bit(ATH10K_FW_FEATURE_WMI_10X, ar->fw_features)) {
>>> +             ret = ath10k_wmi_10x_pull_svc_rdy_ev(skb, &arg);
>>> +             wmi_10x_svc_map(arg.service_map, svc_bmap);
>>> +     } else {
>>> +             ret = ath10k_wmi_pull_svc_rdy_ev(skb, &arg);
>>> +             wmi_main_svc_map(arg.service_map, svc_bmap);
>>> +     }
>>
>> For consistency shouldn't the latter be
>> ath10k_wmi_main_pull_svc_rdy_ev()?
>
> Good point. Makes sense. I'll add the _main to the function name.
>
>
>>> --- a/drivers/net/wireless/ath/ath10k/wmi.h
>>> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
>>> @@ -1394,6 +1394,7 @@ struct wlan_host_mem_req {
>>>   * wmi_service_ready_event,e.g., 11ac pass some of the
>>>   * device capability to the host.
>>>   */
>>> +
>>>  struct wmi_service_ready_event {
>>>       __le32 sw_version;
>>>       __le32 sw_version_1;
>>
>> Isn't this unneeded change?
>
> Good catch. I'll fix that.

Like discussed in IRC, you don't need to resent the whole patchset just
because of this. I have now folded the patch below onto your patch in
ath-next-test, please review:

https://github.com/kvalo/ath/commit/1d13ab4a3bdfd342ed8fbead859de398b379435c

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 37a520150358..a7c11b292bf4 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -2205,8 +2205,8 @@ static int ath10k_wmi_alloc_host_mem(struct ath10k *ar, u32 req_id,
 	return 0;
 }
 
-static int ath10k_wmi_pull_svc_rdy_ev(struct sk_buff *skb,
-				      struct wmi_svc_rdy_ev_arg *arg)
+static int ath10k_wmi_main_pull_svc_rdy_ev(struct sk_buff *skb,
+					   struct wmi_svc_rdy_ev_arg *arg)
 {
 	struct wmi_service_ready_event *ev;
 	size_t i, n;
@@ -2286,7 +2286,7 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar,
 		ret = ath10k_wmi_10x_pull_svc_rdy_ev(skb, &arg);
 		wmi_10x_svc_map(arg.service_map, svc_bmap);
 	} else {
-		ret = ath10k_wmi_pull_svc_rdy_ev(skb, &arg);
+		ret = ath10k_wmi_main_pull_svc_rdy_ev(skb, &arg);
 		wmi_main_svc_map(arg.service_map, svc_bmap);
 	}
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index ebdf15454f27..ca31cdbac557 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -1394,7 +1394,6 @@ struct wlan_host_mem_req {
  * wmi_service_ready_event,e.g., 11ac pass some of the
  * device capability to the host.
  */
-
 struct wmi_service_ready_event {
 	__le32 sw_version;
 	__le32 sw_version_1;


-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

  reply	other threads:[~2014-09-22  9:47 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-18 13:21 [PATCH 0/9] ath10k: mostly cleanups Michal Kazior
2014-09-18 13:21 ` [PATCH 1/9] ath10k: fix tx/rx chainmask init Michal Kazior
2014-09-18 16:11   ` Ben Greear
2014-09-19  5:59     ` Michal Kazior
2014-09-18 13:21 ` [PATCH 2/9] ath10k: remove unused pdev_set_channel command Michal Kazior
2014-09-18 13:21 ` [PATCH 3/9] ath10k: deduplicate wmi_channel code Michal Kazior
2014-09-18 13:21 ` [PATCH 4/9] ath10k: deduplicate host mem chunk code Michal Kazior
2014-09-18 13:21 ` [PATCH 5/9] ath10k: relocate wmi attach/deatch functions Michal Kazior
2014-09-18 13:21 ` [PATCH 6/9] ath10k: deduplicate wmi service ready logic Michal Kazior
2014-09-19  8:37   ` Kalle Valo
2014-09-19  8:43     ` Michal Kazior
2014-09-22  9:46       ` Kalle Valo [this message]
2014-09-22 10:33         ` Michal Kazior
2014-09-18 13:21 ` [PATCH 7/9] ath10k: clean up phyerr code Michal Kazior
2014-09-18 13:21 ` [PATCH 8/9] ath10k: unify wmi event function names Michal Kazior
2014-09-18 13:21 ` [PATCH 9/9] ath10k: re-work scan start command building Michal Kazior
2014-09-23  9:33 ` [PATCH 0/9] ath10k: mostly cleanups Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87oau8m1hg.fsf@kamboji.qca.qualcomm.com \
    --to=kvalo@qca.qualcomm.com \
    --cc=ath10k@lists.infradead.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=michal.kazior@tieto.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox