Skip to contentSkip to conversation

remaining ath10k_ prefixes for sub-modules

PATCH New Bartosz Markowski 2 participants 5 messages Apr 16, 2013 – Apr 17, 2013 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore
#0 lore raw

cover remaining ath10k_ prefixes for sub-modules

After this patch only core, mac and txrx files are not explicitly prefixed. And I think we can leave it like that for now.

Bartosz Markowski (3):
ath10k: add ath10k_ prefixes into wmi functions
ath10k: add ath10k_ prefixes into htt_tx functions
ath10k: add ath10k_ prefixes into htt_rx functions

 drivers/net/wireless/ath/ath10k/core.c   |   18 +-
 drivers/net/wireless/ath/ath10k/debug.c  |    2 +-
 drivers/net/wireless/ath/ath10k/htt.c    |   20 +-
 drivers/net/wireless/ath/ath10k/htt.h    |   28 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c |  121 +++++----
 drivers/net/wireless/ath/ath10k/htt_tx.c |   55 ++--
 drivers/net/wireless/ath/ath10k/mac.c    |  170 ++++++------
 drivers/net/wireless/ath/ath10k/mac.h    |    6 +-
 drivers/net/wireless/ath/ath10k/pci.c    |    6 +-
 drivers/net/wireless/ath/ath10k/txrx.c   |    8 +-
 drivers/net/wireless/ath/ath10k/wmi.c    |  426 +++++++++++++++---------------
 drivers/net/wireless/ath/ath10k/wmi.h    |   98 +++----
 12 files changed, 488 insertions(+), 470 deletions(-)
Signature · 1 line
1.7.10
#1 lore raw

PATCH 1/3 ath10k: add ath10k_ prefixes into wmi functions

---
 drivers/net/wireless/ath/ath10k/core.c  |   14 +-
 drivers/net/wireless/ath/ath10k/debug.c |    2 +-
 drivers/net/wireless/ath/ath10k/mac.c   |  156 ++++++------
 drivers/net/wireless/ath/ath10k/pci.c   |    6 +-
 drivers/net/wireless/ath/ath10k/wmi.c   |  424 ++++++++++++++++---------------
 drivers/net/wireless/ath/ath10k/wmi.h   |   98 +++----
 6 files changed, 359 insertions(+), 341 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +7 -7
index 3cf03a9..fff1277 100644
@@ -113,7 +113,7 @@ static int ath10k_init_connect_htc(struct ath10k *ar)
 	connect.ep_callbacks.context = ar;
 	connect.ep_callbacks.ep_rx_complete = NULL;
 
-	status = wmi_connect_htc_service(ar);
+	status = ath10k_wmi_connect_htc_service(ar);
 	if (status)
 		goto conn_fail;
 
@@ -123,7 +123,7 @@ static int ath10k_init_connect_htc(struct ath10k *ar)
 		goto conn_fail;
 
 	/* Wait for WMI event to be ready */
-	status = wmi_wait_for_service_ready(ar);
+	status = ath10k_wmi_wait_for_service_ready(ar);
 	if (status <= 0) {
 		ath10k_warn("wmi service ready event not received");
 		status = -ETIMEDOUT;
@@ -579,7 +579,7 @@ int ath10k_core_register(struct ath10k *ar)
 	if (status)
 		goto err_htc_destroy;
 
-	status = wmi_attach(ar);
+	status = ath10k_wmi_attach(ar);
 	if (status) {
 		ath10k_err("WMI attach failed: %d\n", status);
 		goto err_htc_destroy;
@@ -603,9 +603,9 @@ int ath10k_core_register(struct ath10k *ar)
 	if (status)
 		goto err_disconnect_htc;
 
-	wmi_cmd_init(ar);
+	ath10k_wmi_cmd_init(ar);
 
-	status = wmi_wait_for_unified_ready(ar);
+	status = ath10k_wmi_wait_for_unified_ready(ar);
 	if (status <= 0) {
 		ath10k_warn("wmi unified ready event not received\n");
 		status = -ETIMEDOUT;
@@ -638,7 +638,7 @@ err_disconnect_htc:
 err_htt_detach:
 	ath10k_htt_detach(ar->htt);
 err_wmi_detach:
-	wmi_detach(ar);
+	ath10k_wmi_detach(ar);
 err_htc_destroy:
 	ath10k_htc_destroy(ar->htc_handle);
 err:
@@ -661,7 +661,7 @@ void ath10k_core_unregister(struct ath10k *ar)
 	/* FIXME: we may need to free up htt tx desc here too */
 	ath10k_htt_detach(ar->htt);
 
-	wmi_detach(ar);
+	ath10k_wmi_detach(ar);
 
 	ath10k_htc_destroy(ar->htc_handle);
 }
drivers/net/wireless/ath/ath10k/debug.c +1 -1
index 9b0096c..8f5b506 100644
@@ -164,7 +164,7 @@ static ssize_t ath10k_read_fw_stats(struct file *file, char __user *user_buf,
 	if (!buf)
 		return -ENOMEM;
 
-	if (wmi_request_stats(ar, WMI_REQUEST_PEER_STAT)) {
+	if (ath10k_wmi_request_stats(ar, WMI_REQUEST_PEER_STAT)) {
 		kfree(buf);
 		return -EIO;
 	}
drivers/net/wireless/ath/ath10k/mac.c +81 -75

402 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/pci.c +3 -3
index 4a3ab09..ce77f9f 100644
@@ -2420,7 +2420,7 @@ static int ath10k_pci_suspend(struct device *device)
 	if (!ar_pci)
 		return -ENODEV;
 
-	if (!wmi_pdev_suspend_target(ar)) {
+	if (!ath10k_wmi_pdev_suspend_target(ar)) {
 		left = wait_event_interruptible_timeout(ar->event_queue,
 					ar->is_target_paused == true,
 					1 * HZ);
@@ -2490,9 +2490,9 @@ static int ath10k_pci_resume(struct device *device)
 			pci_write_config_dword(pdev, 0x40, val & 0xffff00ff);
 	}
 
-	ret = wmi_pdev_resume_target(ar);
+	ret = ath10k_wmi_pdev_resume_target(ar);
 	if (ret)
-		ath10k_warn("wmi_pdev_resume_target: %d\n", ret);
+		ath10k_warn("ath10k_wmi_pdev_resume_target: %d\n", ret);
 
 	return ret;
 }
drivers/net/wireless/ath/ath10k/wmi.c +216 -208

1,168 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/wmi.h +51 -47

107 lines not on this page · raw message

Signature · 1 line
1.7.10
#2 lore raw

PATCH 2/3 ath10k: add ath10k_ prefixes into htt_tx functions

In reply to Bartosz Markowski
---
 drivers/net/wireless/ath/ath10k/core.c   |    4 +--
 drivers/net/wireless/ath/ath10k/htt.c    |   10 +++---
 drivers/net/wireless/ath/ath10k/htt.h    |   20 +++++------
 drivers/net/wireless/ath/ath10k/htt_tx.c |   55 +++++++++++++++---------------
 drivers/net/wireless/ath/ath10k/mac.c    |   14 ++++----
 drivers/net/wireless/ath/ath10k/mac.h    |    6 ++--
 drivers/net/wireless/ath/ath10k/txrx.c   |    8 ++---
 drivers/net/wireless/ath/ath10k/wmi.c    |    2 +-
 8 files changed, 60 insertions(+), 59 deletions(-)
drivers/net/wireless/ath/ath10k/core.c +2 -2
index fff1277..077adc5 100644
@@ -499,7 +499,7 @@ struct ath10k *ath10k_core_create(void *hif_priv, struct device *dev,
 	init_completion(&ar->vdev_setup_done);
 	mutex_init(&ar->vdev_mtx);
 
-	setup_timer(&ar->scan.timeout, ath10k_reset_scan, (unsigned long)ar);
+	setup_timer(&ar->scan.timeout, ath10k_ath10k_reset_scan, (unsigned long)ar);
 
 	ar->workqueue = create_singlethread_workqueue("ath10k_wq");
 	if (!ar->workqueue)
@@ -512,7 +512,7 @@ struct ath10k *ath10k_core_create(void *hif_priv, struct device *dev,
 	init_waitqueue_head(&ar->peer_mapping_wq);
 
 	init_completion(&ar->offchan_tx_completed);
-	INIT_WORK(&ar->offchan_tx_work, ath10k_offchan_tx_work);
+	INIT_WORK(&ar->offchan_tx_work, ath10k_ath10k_offchan_tx_work);
 	skb_queue_head_init(&ar->offchan_tx_queue);
 
 #if defined(CONFIG_PM_SLEEP)
drivers/net/wireless/ath/ath10k/htt.c +5 -5
index f11dd4a..ca78b1c 100644
@@ -87,7 +87,7 @@ struct htt_struct *ath10k_htt_attach(struct ath10k *ar, void *htc_target)
 	if (ath10k_htt_htc_attach(htt))
 		goto fail2;
 
-	htt_tx_attach(htt);
+	ath10k_htt_tx_attach(htt);
 
 	if (htt_rx_attach(htt))
 		goto fail3;
@@ -107,7 +107,7 @@ struct htt_struct *ath10k_htt_attach(struct ath10k *ar, void *htc_target)
 	return htt;
 
 fail3:
-	htt_tx_detach(htt);
+	ath10k_htt_tx_detach(htt);
 fail2:
 	kfree(htt);
 fail1:
@@ -142,7 +142,7 @@ int ath10k_htt_attach_target(struct htt_struct *htt)
 
 	init_completion(&htt->target_version_received);
 
-	status = htt_h2t_ver_req_msg(htt);
+	status = ath10k_htt_h2t_ver_req_msg(htt);
 	if (status)
 		return status;
 
@@ -157,13 +157,13 @@ int ath10k_htt_attach_target(struct htt_struct *htt)
 	if (status)
 		return status;
 
-	return htt_send_rx_ring_cfg_ll(htt);
+	return ath10k_htt_send_rx_ring_cfg_ll(htt);
 
 }
 
 void ath10k_htt_detach(struct htt_struct *htt)
 {
 	htt_rx_detach(htt);
-	htt_tx_detach(htt);
+	ath10k_htt_tx_detach(htt);
 	kfree(htt);
 }
drivers/net/wireless/ath/ath10k/htt.h +10 -10
index 528806d..e67602b 100644
@@ -1299,20 +1299,20 @@ struct htt_struct *ath10k_htt_attach(struct ath10k *ar, void *htc);
 int ath10k_htt_attach_target(struct htt_struct *htt);
 void ath10k_htt_detach(struct htt_struct *htt);
 
-void htt_tx_attach(struct htt_struct *htt);
-void htt_tx_detach(struct htt_struct *htt);
+void ath10k_htt_tx_attach(struct htt_struct *htt);
+void ath10k_htt_tx_detach(struct htt_struct *htt);
 int htt_rx_attach(struct htt_struct *htt);
 void htt_rx_detach(struct htt_struct *htt);
 void htt_t2h_msg_handler(void *context, struct sk_buff *skb);
-int htt_h2t_ver_req_msg(struct htt_struct *htt);
-int htt_send_rx_ring_cfg_ll(struct htt_struct *htt);
+int ath10k_htt_h2t_ver_req_msg(struct htt_struct *htt);
+int ath10k_htt_send_rx_ring_cfg_ll(struct htt_struct *htt);
 
-struct htt_tx_info *htt_tx_info_alloc(struct htt_struct *htt);
-void htt_tx_info_free(struct htt_struct *htt, struct htt_tx_info *pkt);
-void htt_tx_info_unref(struct htt_struct *htt, struct htt_tx_info *pkt,
+struct htt_tx_info *ath10k_htt_tx_info_alloc(struct htt_struct *htt);
+void ath10k_htt_tx_info_free(struct htt_struct *htt, struct htt_tx_info *pkt);
+void ath10k_htt_tx_info_unref(struct htt_struct *htt, struct htt_tx_info *pkt,
 		       struct sk_buff *skb);
-struct htt_tx_info *htt_tx_info_lookup(struct htt_struct *htt, u16 msdu_id);
+struct htt_tx_info *ath10k_htt_tx_info_lookup(struct htt_struct *htt, u16 msdu_id);
 void htt_t2h_stats_handler(struct htt_struct *htt, u8 *stats_msg_buf);
-int htt_mgmt_tx(struct htt_struct *htt, struct sk_buff *);
-int htt_tx(struct htt_struct *htt, struct sk_buff *);
+int ath10k_htt_mgmt_tx(struct htt_struct *htt, struct sk_buff *);
+int ath10k_htt_tx(struct htt_struct *htt, struct sk_buff *);
 #endif
drivers/net/wireless/ath/ath10k/htt_tx.c +28 -27

184 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/mac.c +7 -7
index 3770c30..94b5334 100644
@@ -1270,9 +1270,9 @@ static void ath10k_tx_htt(struct ath10k *ar, struct sk_buff *skb)
 	int ret;
 
 	if (ieee80211_is_mgmt(hdr->frame_control))
-		ret = htt_mgmt_tx(ar->htt, skb);
+		ret = ath10k_htt_mgmt_tx(ar->htt, skb);
 	else
-		ret = htt_tx(ar->htt, skb);
+		ret = ath10k_htt_tx(ar->htt, skb);
 
 	if (ret) {
 		ath10k_warn("tx failed (%d). dropping packet.\n", ret);
@@ -1280,7 +1280,7 @@ static void ath10k_tx_htt(struct ath10k *ar, struct sk_buff *skb)
 	}
 }
 
-void ath10k_offchan_tx_purge(struct ath10k *ar)
+void ath10k_ath10k_offchan_tx_purge(struct ath10k *ar)
 {
 	struct sk_buff *skb;
 
@@ -1293,7 +1293,7 @@ void ath10k_offchan_tx_purge(struct ath10k *ar)
 	}
 }
 
-void ath10k_offchan_tx_work(struct work_struct *work)
+void ath10k_ath10k_offchan_tx_work(struct work_struct *work)
 {
 	struct ath10k *ar = container_of(work, struct ath10k, offchan_tx_work);
 	struct ath10k_peer *peer;
@@ -1369,7 +1369,7 @@ void ath10k_offchan_tx_work(struct work_struct *work)
  * This may indicate the FW has hung and we need to abort the
  * scan manually to prevent cancel_hw_scan() from deadlocking
  */
-void ath10k_reset_scan(unsigned long ptr)
+void ath10k_ath10k_reset_scan(unsigned long ptr)
 {
 	struct ath10k *ar = (struct ath10k *)ptr;
 
@@ -1427,7 +1427,7 @@ static void ath10k_abort_scan(struct ath10k *ar)
 	if (ar->scan.in_progress) {
 		ath10k_warn("%s: could not stop scan (%d)\n", __func__, ret);
 		ar->scan.in_progress = false;
-		ath10k_offchan_tx_purge(ar);
+		ath10k_ath10k_offchan_tx_purge(ar);
 	}
 	spin_unlock_bh(&ar->scan.lock);
 }
@@ -1529,7 +1529,7 @@ static void ath10k_stop(struct ieee80211_hw *hw)
 
 	/* avoid leaks in case FW never confirms scan for offchannel */
 	cancel_work_sync(&ar->offchan_tx_work);
-	ath10k_offchan_tx_purge(ar);
+	ath10k_ath10k_offchan_tx_purge(ar);
 }
 
 static int ath10k_config(struct ieee80211_hw *hw, u32 changed)
drivers/net/wireless/ath/ath10k/mac.h +3 -3
index 272ba74..bc5225b 100644
@@ -26,9 +26,9 @@ void ath10k_mac_destroy(struct ath10k *ar);
 int ath10k_mac_register(struct ath10k *ar);
 void ath10k_mac_unregister(struct ath10k *ar);
 struct ath10k_vif *ath10k_get_arvif(struct ath10k *ar, u32 vdev_id);
-void ath10k_reset_scan(unsigned long ptr);
-void ath10k_offchan_tx_purge(struct ath10k *ar);
-void ath10k_offchan_tx_work(struct work_struct *work);
+void ath10k_ath10k_reset_scan(unsigned long ptr);
+void ath10k_ath10k_offchan_tx_purge(struct ath10k *ar);
+void ath10k_ath10k_offchan_tx_work(struct work_struct *work);
 
 static inline struct ath10k_vif *ath10k_vif_to_arvif(struct ieee80211_vif *vif)
 {
drivers/net/wireless/ath/ath10k/txrx.c +4 -4
index a40d019..19959b5 100644
@@ -54,7 +54,7 @@ void ath10k_data_tx_completed(struct htt_struct *htt,
 		  "msdu_id %d tid %d tid_invalid %d status %d\n",
 		   ev->msdu_id, ev->tid, ev->tid_invalid, ev->status);
 
-	txi = htt_tx_info_lookup(htt, ev->msdu_id);
+	txi = ath10k_htt_tx_info_lookup(htt, ev->msdu_id);
 	if (!txi) {
 		ath10k_dbg(ATH10K_DBG_HTT, "htt txi lookup fail\n");
 		return;
@@ -93,7 +93,7 @@ void ath10k_data_tx_completed(struct htt_struct *htt,
 	}
 
 	txi->htt_tx_completed = true;
-	htt_tx_info_unref(htt, txi, txi->u.data.txdesc);
+	ath10k_htt_tx_info_unref(htt, txi, txi->u.data.txdesc);
 }
 
 static u8 rx_legacy_rate_idx[] = {
@@ -275,7 +275,7 @@ void ath10k_mgmt_tx_completed(struct htt_struct *htt,
 	ath10k_dbg(ATH10K_DBG_HTT, "%s called(), status: %d, msdu_id: %d\n",
 		   __func__, arg->status, arg->desc_id);
 
-	txi = htt_tx_info_lookup(htt, arg->desc_id);
+	txi = ath10k_htt_tx_info_lookup(htt, arg->desc_id);
 	if (WARN_ON(!txi))
 		return;
 
@@ -305,7 +305,7 @@ void ath10k_mgmt_tx_completed(struct htt_struct *htt,
 	}
 
 	txi->htt_tx_completed = true;
-	htt_tx_info_unref(htt, txi, txi->u.mgmt.txdesc);
+	ath10k_htt_tx_info_unref(htt, txi, txi->u.mgmt.txdesc);
 }
 
 struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int vdev_id,
drivers/net/wireless/ath/ath10k/wmi.c +1 -1
index 19970a2..a0e2698 100644
@@ -202,7 +202,7 @@ static int ath10k_wmi_event_scan(struct ath10k *ar, struct sk_buff *skb)
 		}
 
 		if (ar->scan.is_roc) {
-			ath10k_offchan_tx_purge(ar);
+			ath10k_ath10k_offchan_tx_purge(ar);
 
 			if (!ar->scan.aborting)
 				ieee80211_remain_on_channel_expired(ar->hw);
Signature · 1 line
1.7.10
#3 lore raw

PATCH 3/3 ath10k: add ath10k_ prefixes into htt_rx functions

In reply to Bartosz Markowski
---
 drivers/net/wireless/ath/ath10k/htt.c    |   10 +--
 drivers/net/wireless/ath/ath10k/htt.h    |    6 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c |  121 +++++++++++++++---------------
 3 files changed, 68 insertions(+), 69 deletions(-)
drivers/net/wireless/ath/ath10k/htt.c +5 -5
index ca78b1c..0820b5a 100644
@@ -43,7 +43,7 @@ static int ath10k_htt_htc_attach(struct htt_struct *htt)
 	memset(&response, 0, sizeof(response));
 
 	connect.ep_callbacks.context = htt;
-	connect.ep_callbacks.ep_rx_complete = htt_t2h_msg_handler;
+	connect.ep_callbacks.ep_rx_complete = ath10k_htt_t2h_msg_handler;
 	connect.ep_callbacks.stop_queue = ath10k_htt_stop_queue;
 	connect.ep_callbacks.wake_queue = ath10k_htt_wake_queue;
 
@@ -80,8 +80,8 @@ struct htt_struct *ath10k_htt_attach(struct ath10k *ar, void *htc_target)
 
 	/*
 	 * Connect to HTC service.
-	 * This has to be done before calling htt_rx_attach,
-	 * since htt_rx_attach involves sending a rx ring configure
+	 * This has to be done before calling ath10k_htt_rx_attach,
+	 * since ath10k_htt_rx_attach involves sending a rx ring configure
 	 * message to the target.
 	 */
 	if (ath10k_htt_htc_attach(htt))
@@ -89,7 +89,7 @@ struct htt_struct *ath10k_htt_attach(struct ath10k *ar, void *htc_target)
 
 	ath10k_htt_tx_attach(htt);
 
-	if (htt_rx_attach(htt))
+	if (ath10k_htt_rx_attach(htt))
 		goto fail3;
 
 	/*
@@ -163,7 +163,7 @@ int ath10k_htt_attach_target(struct htt_struct *htt)
 
 void ath10k_htt_detach(struct htt_struct *htt)
 {
-	htt_rx_detach(htt);
+	ath10k_htt_rx_detach(htt);
 	ath10k_htt_tx_detach(htt);
 	kfree(htt);
 }
drivers/net/wireless/ath/ath10k/htt.h +3 -3
index e67602b..96178ea 100644
@@ -1301,9 +1301,9 @@ void ath10k_htt_detach(struct htt_struct *htt);
 
 void ath10k_htt_tx_attach(struct htt_struct *htt);
 void ath10k_htt_tx_detach(struct htt_struct *htt);
-int htt_rx_attach(struct htt_struct *htt);
-void htt_rx_detach(struct htt_struct *htt);
-void htt_t2h_msg_handler(void *context, struct sk_buff *skb);
+int ath10k_htt_rx_attach(struct htt_struct *htt);
+void ath10k_htt_rx_detach(struct htt_struct *htt);
+void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb);
 int ath10k_htt_h2t_ver_req_msg(struct htt_struct *htt);
 int ath10k_htt_send_rx_ring_cfg_ll(struct htt_struct *htt);
 
drivers/net/wireless/ath/ath10k/htt_rx.c +60 -61

417 lines not on this page · raw message

Signature · 1 line
1.7.10
#4 lore raw

cover remaining ath10k_ prefixes for sub-modules

In reply to Bartosz Markowski
Quoted 7 lines · Bartosz Markowski

After this patch only core, mac and txrx files are not explicitly prefixed. And I think we can leave it like that for now.

Bartosz Markowski (3):
ath10k: add ath10k_ prefixes into wmi functions
ath10k: add ath10k_ prefixes into htt_tx functions
ath10k: add ath10k_ prefixes into htt_rx functions

Thanks, all applied.

Signature · 1 line
Kalle Valo