Signed-off-by: Bartosz Markowski <bartosz.markow...@tieto.com>
---
drivers/net/wireless/ath/ath10k/wmi.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c
b/drivers/net/wireless/ath/ath10k/wmi.c
index 533e25f..08ad148 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -23,7 +23,7 @@
#include "wmi.h"
#include "mac.h"
-struct wmi_struct {
+struct ath10k_wmi {
struct ath10k *ar;
enum htc_endpoint_id eid;
@@ -38,7 +38,7 @@ struct wmi_struct {
void ath10k_wmi_flush_tx(struct ath10k *ar)
{
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
int ret;
ret = wait_event_timeout(wmi->wq,
@@ -55,7 +55,7 @@ void ath10k_wmi_flush_tx(struct ath10k *ar)
int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
{
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
int ret;
ret = wait_for_completion_timeout(&wmi->service_ready,
WMI_SERVICE_READY_TIMEOUT_HZ);
@@ -64,7 +64,7 @@ int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)
int ath10k_wmi_wait_for_unified_ready(struct ath10k *ar)
{
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
int ret;
ret = wait_for_completion_timeout(&wmi->unified_ready,
WMI_UNIFIED_READY_TIMEOUT_HZ);
@@ -92,7 +92,7 @@ static struct sk_buff *ath10k_wmi_alloc_skb(u32 len)
static void ath10k_wmi_htc_tx_complete(struct sk_buff *skb)
{
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
- struct wmi_struct *wmi = skb_cb->htc.priv;
+ struct ath10k_wmi *wmi = skb_cb->htc.priv;
dev_kfree_skb(skb);
@@ -105,7 +105,7 @@ static int ath10k_wmi_cmd_send(struct ath10k *ar, struct
sk_buff *skb,
enum wmi_cmd_id cmd_id)
{
struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
struct wmi_cmd_hdr *cmd_hdr;
int status;
@@ -841,7 +841,7 @@ static void
ath10k_wmi_event_vdev_install_key_complete(struct ath10k *ar,
static void ath10k_wmi_service_ready_event_rx(struct ath10k *ar, struct
sk_buff *skb)
{
struct ath_common *common = ath10k_common(ar);
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
struct wmi_service_ready_event *ev = (void *)skb->data;
if (skb->len < sizeof(*ev)) {
@@ -899,7 +899,7 @@ static void ath10k_wmi_service_ready_event_rx(struct ath10k
*ar, struct sk_buff
static int ath10k_wmi_ready_event_rx(struct ath10k *ar, struct sk_buff *skb)
{
struct wmi_ready_event *ev = (void *)skb->data;
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
if (WARN_ON(skb->len < sizeof(*ev)))
return -EINVAL;
@@ -925,7 +925,7 @@ static int ath10k_wmi_ready_event_rx(struct ath10k *ar,
struct sk_buff *skb)
return 0;
}
-static void ath10k_wmi_event_process(struct wmi_struct *wmi, struct sk_buff
*skb)
+static void ath10k_wmi_event_process(struct ath10k_wmi *wmi, struct sk_buff
*skb)
{
struct ath10k *ar = wmi->ar;
struct wmi_cmd_hdr *cmd_hdr;
@@ -1055,7 +1055,7 @@ static void ath10k_wmi_event_process(struct wmi_struct
*wmi, struct sk_buff *skb
static void ath10k_wmi_event_work(struct work_struct *work)
{
- struct wmi_struct *wmi = container_of(work, struct wmi_struct,
+ struct ath10k_wmi *wmi = container_of(work, struct ath10k_wmi,
wmi_event_work);
struct sk_buff *skb;
@@ -1070,7 +1070,7 @@ static void ath10k_wmi_event_work(struct work_struct
*work)
static void ath10k_wmi_process_rx(void *ptr, struct sk_buff *skb)
{
- struct wmi_struct *wmi = ptr;
+ struct ath10k_wmi *wmi = ptr;
struct wmi_cmd_hdr *cmd_hdr = (struct wmi_cmd_hdr *)skb->data;
enum wmi_event_id event_id = __le16_to_cpu(cmd_hdr->cmd_id);
@@ -1096,7 +1096,7 @@ static void ath10k_wmi_process_rx(void *ptr, struct
sk_buff *skb)
/* WMI Initialization functions */
int ath10k_wmi_attach(struct ath10k *ar)
{
- struct wmi_struct *wmi;
+ struct ath10k_wmi *wmi;
wmi = kzalloc(sizeof(*wmi), GFP_KERNEL);
if (!wmi)
@@ -1116,7 +1116,7 @@ int ath10k_wmi_attach(struct ath10k *ar)
void ath10k_wmi_detach(struct ath10k *ar)
{
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
struct sk_buff *skb;
/* HTC should've drained the packets already */
@@ -1141,7 +1141,7 @@ int ath10k_wmi_connect_htc_service(struct ath10k *ar)
int status;
struct htc_service_connect_req connect;
struct htc_service_connect_resp response;
- struct wmi_struct *wmi = ar->modules.wmi;
+ struct ath10k_wmi *wmi = ar->modules.wmi;
memset(&connect, 0, sizeof(connect));
memset(&response, 0, sizeof(response));
--
1.7.10
_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel
