Skip to contentSkip to conversation

ath10k: checkpatch fixes 20130424

PATCH New Kalle Valo 1 participant 7 messages Apr 24, 2013 – Apr 25, 2013 Qualcomm Atheros ATH10K wireless driver

lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

cover ath10k: checkpatch fixes 20130424

Few checkpatch fixes.

---

Kalle Valo (5):
ath10k: cosmetic checkpatch fixes to bmi.h, hw.h and txrx.h
ath10k: shorten lines in ath10k_debug_read_target_stats()
ath10k: fix checkpatch warnings from bmi.c, debug.c, htc.h and pci.h
ath10k: fix checkpatch warnings in ce.h, core.c, htc.c, htt_tx.c and txrx.c
ath10k: fix some checkpatch warnings in htt_rx.c and ce.c

 drivers/net/wireless/ath/ath10k/bmi.c    |    7 +-
 drivers/net/wireless/ath/ath10k/bmi.h    |    2 -
 drivers/net/wireless/ath/ath10k/ce.c     |   32 +++++---
 drivers/net/wireless/ath/ath10k/ce.h     |    4 +
 drivers/net/wireless/ath/ath10k/core.c   |   12 ++-
 drivers/net/wireless/ath/ath10k/debug.c  |   15 +++-
 drivers/net/wireless/ath/ath10k/debug.h  |  117 ++++++++++++++++--------------
 drivers/net/wireless/ath/ath10k/htc.c    |   45 ++++++------
 drivers/net/wireless/ath/ath10k/htc.h    |   27 ++++---
 drivers/net/wireless/ath/ath10k/htt_rx.c |   27 +++++--
 drivers/net/wireless/ath/ath10k/htt_tx.c |   46 +++++++-----
 drivers/net/wireless/ath/ath10k/hw.h     |    7 +-
 drivers/net/wireless/ath/ath10k/pci.h    |   25 ++++--
 drivers/net/wireless/ath/ath10k/txrx.c   |    3 +
 drivers/net/wireless/ath/ath10k/txrx.h   |    6 +-
 drivers/net/wireless/ath/ath10k/wmi.h    |    2 -
 16 files changed, 215 insertions(+), 162 deletions(-)
Signature · 1 line
Signature
author
#1 lore raw

PATCH 1/5 ath10k: cosmetic checkpatch fixes to bmi.h, hw.h and txrx.h

---
 drivers/net/wireless/ath/ath10k/bmi.h  |    2 +-
 drivers/net/wireless/ath/ath10k/hw.h   |    7 +++----
 drivers/net/wireless/ath/ath10k/txrx.h |    6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath10k/bmi.h +1 -1
index f431589..d94cbfe 100644
@@ -206,7 +206,7 @@ int ath10k_bmi_write_memory(struct ath10k *ar, u32 address,
 	 })
 
 #define ath10k_bmi_write32(ar, item, val)				\
-	({ 								\
+	({								\
 		int ret;						\
 		u32 address;						\
 		__le32 v = __cpu_to_le32(val);				\
drivers/net/wireless/ath/ath10k/hw.h +3 -4
index 2e6fed9..646386a 100644
@@ -71,7 +71,7 @@ enum ath10k_mcast2ucast_mode {
 #define TARGET_NUM_PEERS			16
 #define TARGET_NUM_OFFLOAD_PEERS		0
 #define TARGET_NUM_PEER_KEYS			2
-#define TARGET_NUM_TIDS				(2 * ((TARGET_NUM_PEERS) + (TARGET_NUM_VDEVS)))
+#define TARGET_NUM_TIDS		(2 * ((TARGET_NUM_PEERS) + (TARGET_NUM_VDEVS)))
 #define TARGET_TX_CHAIN_MASK			(BIT(0) | BIT(1) | BIT(2))
 #define TARGET_RX_CHAIN_MASK			(BIT(0) | BIT(1) | BIT(2))
 #define TARGET_RX_TIMEOUT_LO_PRI		100
@@ -223,7 +223,7 @@ enum ath10k_mcast2ucast_mode {
 #define SCRATCH_3_ADDRESS			0x0030
 
 /* Firmware indications to the Host via SCRATCH_3 register. */
-#define FW_INDICATOR_ADDRESS			(SOC_CORE_BASE_ADDRESS + SCRATCH_3_ADDRESS)
+#define FW_INDICATOR_ADDRESS	(SOC_CORE_BASE_ADDRESS + SCRATCH_3_ADDRESS)
 #define FW_IND_EVENT_PENDING			1
 #define FW_IND_INITIALIZED			2
 
@@ -303,7 +303,6 @@ enum ath10k_mcast2ucast_mode {
 #define MY_TARGET_BOARD_DATA_SZ			AR9888_BOARD_DATA_SZ
 #define MY_TARGET_BOARD_EXT_DATA_SZ		AR9888_BOARD_EXT_DATA_SZ
 
-#define RTC_STATE_V_GET(x) \
-	                (((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB)
+#define RTC_STATE_V_GET(x) (((x) & RTC_STATE_V_MASK) >> RTC_STATE_V_LSB)
 
 #endif /* _HW_H_ */
drivers/net/wireless/ath/ath10k/txrx.h +4 -2
index 8d08c4f..72afb20 100644
@@ -26,8 +26,10 @@ void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info);
 
 struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int vdev_id,
 				     const u8 *addr);
-int ath10k_wait_for_peer_created(struct ath10k *ar, int vdev_id, const u8 *addr);
-int ath10k_wait_for_peer_deleted(struct ath10k *ar, int vdev_id, const u8 *addr);
+int ath10k_wait_for_peer_created(struct ath10k *ar, int vdev_id,
+				 const u8 *addr);
+int ath10k_wait_for_peer_deleted(struct ath10k *ar, int vdev_id,
+				 const u8 *addr);
 
 void ath10k_peer_map_event(struct ath10k_htt *htt,
 			   struct htt_peer_map_event *ev);
author
#2 lore raw

PATCH 2/5 ath10k: shorten lines in ath10k_debug_read_target_stats()

In reply to Kalle Valo

This makes checkpatch a happy boy. No functional changes.

---
 drivers/net/wireless/ath/ath10k/debug.h |  117 +++++++++++++++++--------------
 drivers/net/wireless/ath/ath10k/wmi.h   |    2 -
 2 files changed, 65 insertions(+), 54 deletions(-)
drivers/net/wireless/ath/ath10k/debug.h +64 -53
index 3ae598a..960e07a 100644
@@ -57,66 +57,74 @@ static inline void ath10k_debug_read_target_stats(struct ath10k *ar,
 						  struct wmi_stats_event *ev)
 {
 	u8 *tmp = ev->data;
-	struct ath10k_target_stats *fw_stats;
+	struct ath10k_target_stats *stats;
 	int num_pdev_stats, num_vdev_stats, num_peer_stats;
+	struct wmi_pdev_stats *ps;
 	int i;
 
 	mutex_lock(&ar->conf_mutex);
 
-	fw_stats = &ar->debug.target_stats;
+	stats = &ar->debug.target_stats;
 
 	num_pdev_stats = __le32_to_cpu(ev->num_pdev_stats); /* 0 or 1 */
 	num_vdev_stats = __le32_to_cpu(ev->num_vdev_stats); /* 0 or max vdevs */
 	num_peer_stats = __le32_to_cpu(ev->num_peer_stats); /* 0 or max peers */
 
 	if (num_pdev_stats) {
-		struct wmi_pdev_stats *pdev_stats = (struct wmi_pdev_stats *)tmp;
-
-		fw_stats->ch_noise_floor = __le32_to_cpu(pdev_stats->chan_nf);
-		fw_stats->tx_frame_count = __le32_to_cpu(pdev_stats->tx_frame_count);
-		fw_stats->rx_frame_count = __le32_to_cpu(pdev_stats->rx_frame_count);
-		fw_stats->rx_clear_count = __le32_to_cpu(pdev_stats->rx_clear_count);
-		fw_stats->cycle_count = __le32_to_cpu(pdev_stats->cycle_count);
-		fw_stats->phy_err_count = __le32_to_cpu(pdev_stats->phy_err_count);
-		fw_stats->chan_tx_power = __le32_to_cpu(pdev_stats->chan_tx_pwr);
-
-		fw_stats->comp_queued = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.comp_queued);
-		fw_stats->comp_delivered = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.comp_delivered);
-		fw_stats->msdu_enqued = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.msdu_enqued);
-		fw_stats->mpdu_enqued = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.mpdu_enqued);
-		fw_stats->wmm_drop = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.wmm_drop);
-		fw_stats->local_enqued = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.local_enqued);
-		fw_stats->local_freed = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.local_freed);
-		fw_stats->hw_queued = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.hw_queued);
-		fw_stats->hw_reaped = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.hw_reaped);
-		fw_stats->underrun = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.underrun);
-		fw_stats->tx_abort = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.tx_abort);
-		fw_stats->mpdus_requed = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.mpdus_requed);
-		fw_stats->tx_ko = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.tx_ko);
-		fw_stats->data_rc = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.data_rc);
-		fw_stats->self_triggers = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.self_triggers);
-		fw_stats->sw_retry_failure = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.sw_retry_failure);
-		fw_stats->illgl_rate_phy_err = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.illgl_rate_phy_err);
-		fw_stats->pdev_cont_xretry = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.pdev_cont_xretry);
-		fw_stats->pdev_tx_timeout = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.pdev_tx_timeout);
-		fw_stats->pdev_resets = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.pdev_resets);
-		fw_stats->phy_underrun = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.phy_underrun);
-		fw_stats->txop_ovf = __le32_to_cpu(pdev_stats->wal_pdev_stats.tx.txop_ovf);
-
-		fw_stats->mid_ppdu_route_change = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.mid_ppdu_route_change);
-		fw_stats->status_rcvd = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.status_rcvd);
-		fw_stats->r0_frags = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.r0_frags);
-		fw_stats->r1_frags = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.r1_frags);
-		fw_stats->r2_frags = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.r2_frags);
-		fw_stats->r3_frags = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.r3_frags);
-		fw_stats->htt_msdus = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.htt_msdus);
-		fw_stats->htt_mpdus = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.htt_mpdus);
-		fw_stats->loc_msdus = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.loc_msdus);
-		fw_stats->loc_mpdus = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.loc_mpdus);
-		fw_stats->oversize_amsdu = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.oversize_amsdu);
-		fw_stats->phy_errs = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.phy_errs);
-		fw_stats->phy_err_drop = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.phy_err_drop);
-		fw_stats->mpdu_errs = __le32_to_cpu(pdev_stats->wal_pdev_stats.rx.mpdu_errs);
+		ps = (struct wmi_pdev_stats *)tmp;
+
+		stats->ch_noise_floor = __le32_to_cpu(ps->chan_nf);
+		stats->tx_frame_count = __le32_to_cpu(ps->tx_frame_count);
+		stats->rx_frame_count = __le32_to_cpu(ps->rx_frame_count);
+		stats->rx_clear_count = __le32_to_cpu(ps->rx_clear_count);
+		stats->cycle_count = __le32_to_cpu(ps->cycle_count);
+		stats->phy_err_count = __le32_to_cpu(ps->phy_err_count);
+		stats->chan_tx_power = __le32_to_cpu(ps->chan_tx_pwr);
+
+		stats->comp_queued = __le32_to_cpu(ps->wal.tx.comp_queued);
+		stats->comp_delivered =
+			__le32_to_cpu(ps->wal.tx.comp_delivered);
+		stats->msdu_enqued = __le32_to_cpu(ps->wal.tx.msdu_enqued);
+		stats->mpdu_enqued = __le32_to_cpu(ps->wal.tx.mpdu_enqued);
+		stats->wmm_drop = __le32_to_cpu(ps->wal.tx.wmm_drop);
+		stats->local_enqued = __le32_to_cpu(ps->wal.tx.local_enqued);
+		stats->local_freed = __le32_to_cpu(ps->wal.tx.local_freed);
+		stats->hw_queued = __le32_to_cpu(ps->wal.tx.hw_queued);
+		stats->hw_reaped = __le32_to_cpu(ps->wal.tx.hw_reaped);
+		stats->underrun = __le32_to_cpu(ps->wal.tx.underrun);
+		stats->tx_abort = __le32_to_cpu(ps->wal.tx.tx_abort);
+		stats->mpdus_requed = __le32_to_cpu(ps->wal.tx.mpdus_requed);
+		stats->tx_ko = __le32_to_cpu(ps->wal.tx.tx_ko);
+		stats->data_rc = __le32_to_cpu(ps->wal.tx.data_rc);
+		stats->self_triggers = __le32_to_cpu(ps->wal.tx.self_triggers);
+		stats->sw_retry_failure =
+			__le32_to_cpu(ps->wal.tx.sw_retry_failure);
+		stats->illgl_rate_phy_err =
+			__le32_to_cpu(ps->wal.tx.illgl_rate_phy_err);
+		stats->pdev_cont_xretry =
+			__le32_to_cpu(ps->wal.tx.pdev_cont_xretry);
+		stats->pdev_tx_timeout =
+			__le32_to_cpu(ps->wal.tx.pdev_tx_timeout);
+		stats->pdev_resets = __le32_to_cpu(ps->wal.tx.pdev_resets);
+		stats->phy_underrun = __le32_to_cpu(ps->wal.tx.phy_underrun);
+		stats->txop_ovf = __le32_to_cpu(ps->wal.tx.txop_ovf);
+
+		stats->mid_ppdu_route_change =
+			__le32_to_cpu(ps->wal.rx.mid_ppdu_route_change);
+		stats->status_rcvd = __le32_to_cpu(ps->wal.rx.status_rcvd);
+		stats->r0_frags = __le32_to_cpu(ps->wal.rx.r0_frags);
+		stats->r1_frags = __le32_to_cpu(ps->wal.rx.r1_frags);
+		stats->r2_frags = __le32_to_cpu(ps->wal.rx.r2_frags);
+		stats->r3_frags = __le32_to_cpu(ps->wal.rx.r3_frags);
+		stats->htt_msdus = __le32_to_cpu(ps->wal.rx.htt_msdus);
+		stats->htt_mpdus = __le32_to_cpu(ps->wal.rx.htt_mpdus);
+		stats->loc_msdus = __le32_to_cpu(ps->wal.rx.loc_msdus);
+		stats->loc_mpdus = __le32_to_cpu(ps->wal.rx.loc_mpdus);
+		stats->oversize_amsdu =
+			__le32_to_cpu(ps->wal.rx.oversize_amsdu);
+		stats->phy_errs = __le32_to_cpu(ps->wal.rx.phy_errs);
+		stats->phy_err_drop = __le32_to_cpu(ps->wal.rx.phy_err_drop);
+		stats->mpdu_errs = __le32_to_cpu(ps->wal.rx.mpdu_errs);
 
 		tmp += sizeof(struct wmi_pdev_stats);
 	}
@@ -134,16 +142,19 @@ static inline void ath10k_debug_read_target_stats(struct ath10k *ar,
 
 	if (num_peer_stats) {
 		struct wmi_peer_stats *peer_stats;
+		struct ath10k_peer_stat *s;
 
-		fw_stats->peers = num_peer_stats;
+		stats->peers = num_peer_stats;
 
 		for (i = 0; i < num_peer_stats; i++) {
 			peer_stats = (struct wmi_peer_stats *)tmp;
+			s = &stats->peer_stat[i];
 
 			WMI_MAC_ADDR_TO_CHAR_ARRAY(&peer_stats->peer_macaddr,
-						   fw_stats->peer_stat[i].peer_macaddr);
-			fw_stats->peer_stat[i].peer_rssi = __le32_to_cpu(peer_stats->peer_rssi);
-			fw_stats->peer_stat[i].peer_tx_rate = __le32_to_cpu(peer_stats->peer_tx_rate);
+						   s->peer_macaddr);
+			s->peer_rssi = __le32_to_cpu(peer_stats->peer_rssi);
+			s->peer_tx_rate =
+				__le32_to_cpu(peer_stats->peer_tx_rate);
 
 			tmp += sizeof(struct wmi_peer_stats);
 		}
drivers/net/wireless/ath/ath10k/wmi.h +1 -1
index 50f94a37..dc52c33 100644
@@ -1750,7 +1750,7 @@ struct wmi_pdev_stats {
 	__le32 cycle_count;    /* cycle count */
 	__le32 phy_err_count;  /* Phy error count */
 	__le32 chan_tx_pwr;    /* channel tx power */
-	struct wal_dbg_stats wal_pdev_stats; /* WAL dbg stats */
+	struct wal_dbg_stats wal; /* WAL dbg stats */
 } __packed;
 
 /*
author
#3 lore raw

PATCH 3/5 ath10k: fix checkpatch warnings from bmi.c, debug.c, htc.h and pci.h

In reply to Kalle Valo
---
 drivers/net/wireless/ath/ath10k/bmi.c   |    7 ++++---
 drivers/net/wireless/ath/ath10k/debug.c |   15 ++++++++++-----
 drivers/net/wireless/ath/ath10k/htc.h   |   27 ++++++++++++++-------------
 drivers/net/wireless/ath/ath10k/pci.h   |   25 ++++++++++++++++---------
 4 files changed, 44 insertions(+), 30 deletions(-)
drivers/net/wireless/ath/ath10k/bmi.c +4 -3
index 85bf366..5dc4b14 100644
@@ -68,7 +68,7 @@ int ath10k_bmi_get_target_info(struct ath10k *ar,
 
 	if (resplen < sizeof(resp.get_target_info)) {
 		ath10k_warn("invalid get_target_info response length (%d)\n",
-				resplen);
+			    resplen);
 		return -EIO;
 	}
 
@@ -102,7 +102,8 @@ int ath10k_bmi_read_memory(struct ath10k *ar,
 		cmd.read_mem.addr = __cpu_to_le32(address);
 		cmd.read_mem.len  = __cpu_to_le32(rxlen);
 
-		ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen, &resp, &rxlen);
+		ret = ath10k_hif_exchange_bmi_msg(ar, &cmd, cmdlen,
+						  &resp, &rxlen);
 		if (ret) {
 			ath10k_warn("unable to read from the device\n");
 			return ret;
@@ -192,7 +193,7 @@ int ath10k_bmi_execute(struct ath10k *ar, u32 address, u32 *param)
 
 	if (resplen < sizeof(resp.execute)) {
 		ath10k_warn("invalid execute response length (%d)\n",
-				resplen);
+			    resplen);
 		return ret;
 	}
 
drivers/net/wireless/ath/ath10k/debug.c +10 -5
index 7e6b7034..3357917 100644
@@ -236,9 +236,11 @@ static ssize_t ath10k_read_fw_stats(struct file *file, char __user *user_buf,
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
 			 "Sched self tiggers", fw_stats->self_triggers);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
-			 "Dropped due to SW retries", fw_stats->sw_retry_failure);
+			 "Dropped due to SW retries",
+			 fw_stats->sw_retry_failure);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
-			 "Illegal rate phy errors", fw_stats->illgl_rate_phy_err);
+			 "Illegal rate phy errors",
+			 fw_stats->illgl_rate_phy_err);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
 			 "Pdev continous xretry", fw_stats->pdev_cont_xretry);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
@@ -257,7 +259,8 @@ static ssize_t ath10k_read_fw_stats(struct file *file, char __user *user_buf,
 				 "=================");
 
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
-			 "Mid PPDU route change", fw_stats->mid_ppdu_route_change);
+			 "Mid PPDU route change",
+			 fw_stats->mid_ppdu_route_change);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
 			 "Tot. number of statuses", fw_stats->status_rcvd);
 	len += scnprintf(buf + len, buf_len - len, "%30s %10d\n",
@@ -293,11 +296,13 @@ static ssize_t ath10k_read_fw_stats(struct file *file, char __user *user_buf,
 
 	for (i = 0; i < fw_stats->peers; i++) {
 		len += scnprintf(buf + len, buf_len - len, "%30s %pM\n",
-				 "Peer MAC address", fw_stats->peer_stat[i].peer_macaddr);
+				 "Peer MAC address",
+				 fw_stats->peer_stat[i].peer_macaddr);
 		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
 				 "Peer RSSI", fw_stats->peer_stat[i].peer_rssi);
 		len += scnprintf(buf + len, buf_len - len, "%30s %u\n",
-				 "Peer TX rate", fw_stats->peer_stat[i].peer_tx_rate);
+				 "Peer TX rate",
+				 fw_stats->peer_stat[i].peer_tx_rate);
 		len += scnprintf(buf + len, buf_len - len, "\n");
 	}
 
drivers/net/wireless/ath/ath10k/htc.h +14 -13
index a9619e6..3d03019 100644
@@ -234,23 +234,23 @@ enum ath10k_htc_svc_gid {
 
 enum ath10k_htc_svc_id {
 	/* NOTE: service ID of 0x0000 is reserved and should never be used */
-	ATH10K_HTC_SVC_ID_RESERVED		= 0x0000,
-	ATH10K_HTC_SVC_ID_UNUSED		= ATH10K_HTC_SVC_ID_RESERVED,
+	ATH10K_HTC_SVC_ID_RESERVED	= 0x0000,
+	ATH10K_HTC_SVC_ID_UNUSED	= ATH10K_HTC_SVC_ID_RESERVED,
 
-	ATH10K_HTC_SVC_ID_RSVD_CTRL		= SVC(ATH10K_HTC_SVC_GRP_RSVD, 1),
-	ATH10K_HTC_SVC_ID_WMI_CONTROL		= SVC(ATH10K_HTC_SVC_GRP_WMI, 0),
-	ATH10K_HTC_SVC_ID_WMI_DATA_BE		= SVC(ATH10K_HTC_SVC_GRP_WMI, 1),
-	ATH10K_HTC_SVC_ID_WMI_DATA_BK		= SVC(ATH10K_HTC_SVC_GRP_WMI, 2),
-	ATH10K_HTC_SVC_ID_WMI_DATA_VI		= SVC(ATH10K_HTC_SVC_GRP_WMI, 3),
-	ATH10K_HTC_SVC_ID_WMI_DATA_VO		= SVC(ATH10K_HTC_SVC_GRP_WMI, 4),
+	ATH10K_HTC_SVC_ID_RSVD_CTRL	= SVC(ATH10K_HTC_SVC_GRP_RSVD, 1),
+	ATH10K_HTC_SVC_ID_WMI_CONTROL	= SVC(ATH10K_HTC_SVC_GRP_WMI, 0),
+	ATH10K_HTC_SVC_ID_WMI_DATA_BE	= SVC(ATH10K_HTC_SVC_GRP_WMI, 1),
+	ATH10K_HTC_SVC_ID_WMI_DATA_BK	= SVC(ATH10K_HTC_SVC_GRP_WMI, 2),
+	ATH10K_HTC_SVC_ID_WMI_DATA_VI	= SVC(ATH10K_HTC_SVC_GRP_WMI, 3),
+	ATH10K_HTC_SVC_ID_WMI_DATA_VO	= SVC(ATH10K_HTC_SVC_GRP_WMI, 4),
 
-	ATH10K_HTC_SVC_ID_NMI_CONTROL		= SVC(ATH10K_HTC_SVC_GRP_NMI, 0),
-	ATH10K_HTC_SVC_ID_NMI_DATA		= SVC(ATH10K_HTC_SVC_GRP_NMI, 1),
+	ATH10K_HTC_SVC_ID_NMI_CONTROL	= SVC(ATH10K_HTC_SVC_GRP_NMI, 0),
+	ATH10K_HTC_SVC_ID_NMI_DATA	= SVC(ATH10K_HTC_SVC_GRP_NMI, 1),
 
-	ATH10K_HTC_SVC_ID_HTT_DATA_MSG		= SVC(ATH10K_HTC_SVC_GRP_HTT, 0),
+	ATH10K_HTC_SVC_ID_HTT_DATA_MSG	= SVC(ATH10K_HTC_SVC_GRP_HTT, 0),
 
 	/* raw stream service (i.e. flash, tcmd, calibration apps) */
-	ATH10K_HTC_SVC_ID_TEST_RAW_STREAMS	= SVC(ATH10K_HTC_SVC_GRP_TEST, 0),
+	ATH10K_HTC_SVC_ID_TEST_RAW_STREAMS = SVC(ATH10K_HTC_SVC_GRP_TEST, 0),
 };
 
 #undef SVC
@@ -301,7 +301,8 @@ struct ath10k_htc_svc_conn_resp {
 #define ATH10K_HTC_MAX_LEN 4096
 #define ATH10K_HTC_MAX_CTRL_MSG_LEN 256
 #define ATH10K_HTC_WAIT_TIMEOUT_HZ (1*HZ)
-#define ATH10K_HTC_CONTROL_BUFFER_SIZE (ATH10K_HTC_MAX_CTRL_MSG_LEN + sizeof(struct ath10k_htc_hdr))
+#define ATH10K_HTC_CONTROL_BUFFER_SIZE (ATH10K_HTC_MAX_CTRL_MSG_LEN + \
+					sizeof(struct ath10k_htc_hdr))
 #define ATH10K_HTC_CONN_SVC_TIMEOUT_HZ (1*HZ)
 
 struct ath10k_htc_ep {
drivers/net/wireless/ath/ath10k/pci.h +16 -9
index e05a7e0..7f3158e 100644
@@ -237,11 +237,13 @@ static inline struct ath10k_pci *ath10k_pci_priv(struct ath10k *ar)
 	return ar->hif.priv;
 }
 
-static inline u32 ath10k_pci_reg_read32(void __iomem *mem, u32 addr) {
+static inline u32 ath10k_pci_reg_read32(void __iomem *mem, u32 addr)
+{
 	return ioread32(mem + PCIE_LOCAL_BASE_ADDRESS + addr);
 }
 
-static inline void ath10k_pci_reg_write32(void __iomem *mem, u32 addr, u32 val) {
+static inline void ath10k_pci_reg_write32(void __iomem *mem, u32 addr, u32 val)
+{
 	iowrite32(val, mem + PCIE_LOCAL_BASE_ADDRESS + addr);
 }
 
@@ -268,7 +270,8 @@ static inline void ath10k_pci_reg_write32(void __iomem *mem, u32 addr, u32 val)
 /* Wait up to this many Ms for a Diagnostic Access CE operation to complete */
 #define DIAG_ACCESS_CE_TIMEOUT_MS 10
 
-static inline void pci_write32_v1_workaround(struct ath10k *ar, u32 offset, u32 value)
+static inline void pci_write32_v1_workaround(struct ath10k *ar, u32 offset,
+					     u32 value)
 {
 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
 	void __iomem *addr = ar_pci->mem;
@@ -283,7 +286,8 @@ static inline void pci_write32_v1_workaround(struct ath10k *ar, u32 offset, u32
 		ioread32(addr+offset+4); /* 1st read prior to write */
 		iowrite32(value, addr+offset);
 
-		spin_unlock_irqrestore(&ar_pci->hw_v1_workaround_lock, irq_flags);
+		spin_unlock_irqrestore(&ar_pci->hw_v1_workaround_lock,
+				       irq_flags);
 	} else
 		iowrite32(value, addr+offset);
 }
@@ -317,20 +321,23 @@ static inline void pci_write32_v1_workaround(struct ath10k *ar, u32 offset, u32
  *   directly accessible.  BEGIN/END is under a reference counter;
  *   multiple code paths may issue BEGIN/END on a single targid.
  */
-static inline void ath10k_pci_write32(struct ath10k *ar, u32 offset, u32 value) {
+static inline void ath10k_pci_write32(struct ath10k *ar, u32 offset,
+				      u32 value)
+{
 	pci_write32_v1_workaround(ar, offset, value);
 }
 
-static inline u32 ath10k_pci_read32(struct ath10k *ar, u32 offset) {
+static inline u32 ath10k_pci_read32(struct ath10k *ar, u32 offset)
+{
 	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
 
 	return ioread32(ar_pci->mem + offset);
 }
 
 /*
- * FIXME: This function is a wrapper to workaround QCA988x_1.0 HW CE problem.
-          If we decide to drop this HW revision support in the future, we
-          may drop the function as well.
+ * FIXME: This function is a wrapper to workaround QCA988x_1.0 HW CE
+ * problem. If we decide to drop this HW revision support in the future, we
+ * may drop the function as well.
  */
 static inline void ath10k_set_source_ring_write_index(struct ath10k *ar,
 						      u32 ctrl_addr,
author
#4 lore raw

PATCH 4/5 ath10k: fix checkpatch warnings in ce.h, core.c, htc.c, htt_tx.c and txrx.c

In reply to Kalle Valo
---
 drivers/net/wireless/ath/ath10k/ce.h     |    4 +--
 drivers/net/wireless/ath/ath10k/core.c   |   12 +++++---
 drivers/net/wireless/ath/ath10k/htc.c    |   45 ++++++++++++++++-------------
 drivers/net/wireless/ath/ath10k/htt_tx.c |   46 +++++++++++++++++-------------
 drivers/net/wireless/ath/ath10k/txrx.c   |    3 +-
 5 files changed, 62 insertions(+), 48 deletions(-)
drivers/net/wireless/ath/ath10k/ce.h +2 -2
index 110532f..4558630 100644
@@ -193,7 +193,7 @@ int ath10k_ce_send(struct ce_state *ce_state,
 
 void ath10k_ce_send_cb_register(struct ce_state *ce_state,
 				void (*send_cb) (struct ce_state *ce_state,
-						 void *per_transfer_send_context,
+						 void *transfer_context,
 						 u32 buffer,
 						 unsigned int nbytes,
 						 unsigned int transfer_id),
@@ -240,7 +240,7 @@ int ath10k_ce_recv_buf_enqueue(struct ce_state *ce_state,
 
 void ath10k_ce_recv_cb_register(struct ce_state *ce_state,
 				void (*recv_cb) (struct ce_state *ce_state,
-						 void *per_transfer_recv_context,
+						 void *transfer_context,
 						 u32 buffer,
 						 unsigned int nbytes,
 						 unsigned int transfer_id,
drivers/net/wireless/ath/ath10k/core.c +8 -4
index 4ff500c..ed2c94f 100644
@@ -132,7 +132,8 @@ static int ath10k_init_configure_target(struct ath10k *ar)
 	int ret;
 
 	/* tell target which HTC version it is used*/
-	ret = ath10k_bmi_write32(ar, hi_app_host_interest, HTC_PROTOCOL_VERSION);
+	ret = ath10k_bmi_write32(ar, hi_app_host_interest,
+				 HTC_PROTOCOL_VERSION);
 	if (ret) {
 		ath10k_err("settings HTC version failed\n");
 		return ret;
@@ -285,7 +286,8 @@ static int ath10k_init_transfer_bin_file(struct ath10k *ar,
 			}
 
 			/*
-			 * Record the fact that extended board Data IS initialized
+			 * Record the fact that extended board Data IS
+			 * initialized
 			 */
 			ath10k_bmi_write32(ar, hi_board_ext_data_config,
 					   (board_ext_data_size << 16) | 1);
@@ -602,7 +604,8 @@ void ath10k_core_unregister(struct ath10k *ar)
 }
 EXPORT_SYMBOL(ath10k_core_unregister);
 
-int ath10k_core_target_suspend(struct ath10k *ar) {
+int ath10k_core_target_suspend(struct ath10k *ar)
+{
 	int ret;
 
 	ath10k_dbg(ATH10K_DBG_CORE, "%s: called", __func__);
@@ -613,7 +616,8 @@ int ath10k_core_target_suspend(struct ath10k *ar) {
 }
 EXPORT_SYMBOL(ath10k_core_target_suspend);
 
-int ath10k_core_target_resume(struct ath10k *ar) {
+int ath10k_core_target_resume(struct ath10k *ar)
+{
 
 	int ret;
 
drivers/net/wireless/ath/ath10k/htc.c +24 -21

123 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/htt_tx.c +26 -20

64 lines not on this page · raw message

drivers/net/wireless/ath/ath10k/txrx.c +2 -1
index 23c3a5d..41b58ba 100644
@@ -109,7 +109,8 @@ void ath10k_txrx_tx_completed(struct ath10k_htt *htt,
 		   tx_done->msdu_id, !!tx_done->discard, !!tx_done->no_ack);
 
 	if (tx_done->msdu_id >= ARRAY_SIZE(htt->pending_tx)) {
-		ath10k_warn("warning: msdu_id %d too big, ignoring\n", tx_done->msdu_id);
+		ath10k_warn("warning: msdu_id %d too big, ignoring\n",
+			    tx_done->msdu_id);
 		return;
 	}
 
author
#5 lore raw

PATCH 5/5 ath10k: fix some checkpatch warnings in htt_rx.c and ce.c

In reply to Kalle Valo
---
 drivers/net/wireless/ath/ath10k/ce.c     |   32 +++++++++++++++++-------------
 drivers/net/wireless/ath/ath10k/htt_rx.c |   27 +++++++++++++++++--------
 2 files changed, 36 insertions(+), 23 deletions(-)
drivers/net/wireless/ath/ath10k/ce.c +18 -14
index 969f24d..454025e 100644
@@ -552,7 +552,8 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id)
 							    &buf, &nbytes,
 							    &id, &flags) == 0) {
 			spin_unlock_bh(&ar_pci->ce_lock);
-			ce_state->recv_cb(ce_state, transfer_context, buf, nbytes, id, flags);
+			ce_state->recv_cb(ce_state, transfer_context, buf,
+					  nbytes, id, flags);
 			spin_lock_bh(&ar_pci->ce_lock);
 		}
 	}
@@ -568,7 +569,8 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id)
 							    &nbytes,
 							    &id) == 0) {
 			spin_unlock_bh(&ar_pci->ce_lock);
-			ce_state->send_cb(ce_state, transfer_context, buf, nbytes, id);
+			ce_state->send_cb(ce_state, transfer_context,
+					  buf, nbytes, id);
 			spin_lock_bh(&ar_pci->ce_lock);
 		}
 	}
@@ -626,7 +628,8 @@ static void ath10k_ce_per_engine_handler_adjust(struct ce_state *ce_state,
 
 	ath10k_pci_wake(ar);
 
-	if ((!disable_copy_compl_intr) && (ce_state->send_cb || ce_state->recv_cb))
+	if ((!disable_copy_compl_intr) &&
+	    (ce_state->send_cb || ce_state->recv_cb))
 		CE_COPY_COMPLETE_INTR_ENABLE(ar, ctrl_addr);
 	else
 		CE_COPY_COMPLETE_INTR_DISABLE(ar, ctrl_addr);
@@ -845,7 +848,8 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar,
 	}
 
 	ath10k_pci_wake(ar);
-	CE_DEST_RING_BASE_ADDR_SET(ar, ctrl_addr, dest_ring->base_addr_ce_space);
+	CE_DEST_RING_BASE_ADDR_SET(ar, ctrl_addr,
+				   dest_ring->base_addr_ce_space);
 	CE_DEST_RING_SZ_SET(ar, ctrl_addr, nentries);
 	CE_DEST_RING_BYTE_SWAP_SET(ar, ctrl_addr, 0);
 	CE_DEST_RING_LOWMARK_SET(ar, ctrl_addr, 0);
@@ -943,21 +947,21 @@ void ath10k_ce_deinit(struct ce_state *ce_state)
 	if (ce_state->src_ring) {
 		kfree(ce_state->src_ring->shadow_base_unaligned);
 		pci_free_consistent(ar_pci->pdev,
-				   (ce_state->src_ring->nentries *
-				    sizeof(struct ce_desc) +
-				    CE_DESC_RING_ALIGN),
-				   ce_state->src_ring->base_addr_owner_space,
-				   ce_state->src_ring->base_addr_ce_space);
+				    (ce_state->src_ring->nentries *
+				     sizeof(struct ce_desc) +
+				     CE_DESC_RING_ALIGN),
+				    ce_state->src_ring->base_addr_owner_space,
+				    ce_state->src_ring->base_addr_ce_space);
 		kfree(ce_state->src_ring);
 	}
 
 	if (ce_state->dest_ring) {
 		pci_free_consistent(ar_pci->pdev,
-				   (ce_state->dest_ring->nentries *
-				    sizeof(struct ce_desc) +
-				    CE_DESC_RING_ALIGN),
-				   ce_state->dest_ring->base_addr_owner_space,
-				   ce_state->dest_ring->base_addr_ce_space);
+				    (ce_state->dest_ring->nentries *
+				     sizeof(struct ce_desc) +
+				     CE_DESC_RING_ALIGN),
+				    ce_state->dest_ring->base_addr_owner_space,
+				    ce_state->dest_ring->base_addr_ce_space);
 		kfree(ce_state->dest_ring);
 	}
 	kfree(ce_state);
drivers/net/wireless/ath/ath10k/htt_rx.c +18 -9
index 8c018ab..e88b031 100644
@@ -126,7 +126,9 @@ static void ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
 		}
 
 		if (!IS_ALIGNED((unsigned long)skb->data, HTT_RX_DESC_ALIGN))
-			skb_pull(skb, PTR_ALIGN(skb->data, HTT_RX_DESC_ALIGN) - skb->data);
+			skb_pull(skb,
+				 PTR_ALIGN(skb->data, HTT_RX_DESC_ALIGN) -
+				 skb->data);
 
 		/* Clear rx_desc attention word before posting to Rx ring */
 		rx_desc = (struct htt_rx_desc *)skb->data;
@@ -353,7 +355,8 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
 					 DMA_FROM_DEVICE);
 
 			ath10k_dbg_dump(ATH10K_DBG_HTT_DUMP, NULL, "htt rx: ",
-					next->data, next->len + skb_tailroom(next));
+					next->data,
+					next->len + skb_tailroom(next));
 
 			skb_trim(next, 0);
 			skb_put(next, min(msdu_len, HTT_RX_BUF_SIZE));
@@ -366,11 +369,12 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
 
 		if (msdu_len > 0) {
 			/* This may suggest FW bug? */
-			ath10k_warn("htt rx msdu len not consumed (%d)\n", msdu_len);
+			ath10k_warn("htt rx msdu len not consumed (%d)\n",
+				    msdu_len);
 		}
 
 		last_msdu = __le32_to_cpu(rx_desc->msdu_end.info0) &
-							RX_MSDU_END_INFO0_LAST_MSDU;
+				RX_MSDU_END_INFO0_LAST_MSDU;
 
 		if (last_msdu) {
 			msdu->next = NULL;
@@ -741,7 +745,8 @@ static bool ath10k_htt_rx_has_fcs_err(struct sk_buff *skb)
 	return false;
 }
 
-static void ath10k_htt_rx_handler(struct ath10k_htt *htt, struct htt_rx_indication *rx)
+static void ath10k_htt_rx_handler(struct ath10k_htt *htt,
+				  struct htt_rx_indication *rx)
 {
 	struct htt_rx_info info;
 	struct htt_rx_indication_mpdu_range *mpdu_ranges;
@@ -962,7 +967,8 @@ void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb)
 	if ((((unsigned long)skb->data) & 0x3) != 0)
 		ath10k_warn("unaligned htt message, expect trouble\n");
 
-	ath10k_dbg(ATH10K_DBG_HTT, "HTT RX, msg_type: 0x%0X\n", resp->hdr.msg_type);
+	ath10k_dbg(ATH10K_DBG_HTT, "HTT RX, msg_type: 0x%0X\n",
+		   resp->hdr.msg_type);
 	switch (resp->hdr.msg_type) {
 	case HTT_T2H_MSG_TYPE_VERSION_CONF: {
 		htt->target_version_major = resp->ver_resp.major;
@@ -1011,7 +1017,8 @@ void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb)
 	}
 	case HTT_T2H_MSG_TYPE_TX_COMPL_IND: {
 		struct htt_tx_done tx_done = {};
-		int status = MS(resp->data_tx_completion.flags, HTT_DATA_TX_STATUS);
+		int status = MS(resp->data_tx_completion.flags,
+				HTT_DATA_TX_STATUS);
 		int i;
 
 		switch (status) {
@@ -1028,7 +1035,8 @@ void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb)
 			tx_done.discard = true;
 			break;
 		default:
-			ath10k_warn("unhandled tx completion status %d\n", status);
+			ath10k_warn("unhandled tx completion status %d\n",
+				    status);
 			tx_done.discard = true;
 			break;
 		}
@@ -1037,7 +1045,8 @@ void ath10k_htt_t2h_msg_handler(void *context, struct sk_buff *skb)
 			   resp->data_tx_completion.num_msdus);
 
 		for (i = 0; i < resp->data_tx_completion.num_msdus; i++) {
-			tx_done.msdu_id = __le16_to_cpu(resp->data_tx_completion.msdus[i]);
+			tx_done.msdu_id =
+				__le16_to_cpu(resp->data_tx_completion.msdus[i]);
 			ath10k_txrx_tx_completed(htt, &tx_done);
 		}
 		break;
author Applied
#6 lore raw

cover ath10k: checkpatch fixes 20130424

In reply to Kalle Valo
Quoted 10 lines · Kalle Valo

Few checkpatch fixes.

---

Kalle Valo (5):
ath10k: cosmetic checkpatch fixes to bmi.h, hw.h and txrx.h
ath10k: shorten lines in ath10k_debug_read_target_stats()
ath10k: fix checkpatch warnings from bmi.c, debug.c, htc.h and pci.h
ath10k: fix checkpatch warnings in ce.h, core.c, htc.c, htt_tx.c and txrx.c
ath10k: fix some checkpatch warnings in htt_rx.c and ce.c

Applied.

Signature · 1 line
Kalle Valo