From: Kalle Valo Date: Wed, 24 Apr 2013 15:33:02 +0300 Subject: [ath9k-devel] [PATCH 3/5] ath10k: fix checkpatch warnings from bmi.c, debug.c, htc.h and pci.h In-Reply-To: <20130424123142.30784.57385.stgit@localhost6.localdomain6> References: <20130424123142.30784.57385.stgit@localhost6.localdomain6> Message-ID: <20130424123302.30784.3888.stgit@localhost6.localdomain6> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org Signed-off-by: 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(-) diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c index 85bf366..5dc4b14 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.c +++ b/drivers/net/wireless/ath/ath10k/bmi.c @@ -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; } diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c index 7e6b7034..3357917 100644 --- a/drivers/net/wireless/ath/ath10k/debug.c +++ b/drivers/net/wireless/ath/ath10k/debug.c @@ -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"); } diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index a9619e6..3d03019 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -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 { diff --git a/drivers/net/wireless/ath/ath10k/pci.h b/drivers/net/wireless/ath/ath10k/pci.h index e05a7e0..7f3158e 100644 --- a/drivers/net/wireless/ath/ath10k/pci.h +++ b/drivers/net/wireless/ath/ath10k/pci.h @@ -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,