Browse Source

ath10k: miscellaneous checkpatch fixes

Fixes checkpatch warnings:

ath10k/htc.c:49: WARNING: Possible unnecessary 'out of memory' message
ath10k/htc.c:810: WARNING: Possible unnecessary 'out of memory' message
ath10k/htt.h:1034: CHECK: Please use a blank line after function/struct/union/enum declarations
ath10k/htt_rx.c:135: CHECK: Unnecessary parentheses around htt->rx_ring.alloc_idx.vaddr
ath10k/htt_rx.c:173: CHECK: Unnecessary parentheses around htt->rx_ring.alloc_idx.vaddr
ath10k/pci.c:633: WARNING: macros should not use a trailing semicolon
ath10k/wmi.c:3594: WARNING: quoted string split across lines

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Kalle Valo 11 years ago
parent
commit
8cc7f26c78

+ 2 - 6
drivers/net/wireless/ath/ath10k/htc.c

@@ -45,10 +45,8 @@ static struct sk_buff *ath10k_htc_build_tx_ctrl_skb(void *ar)
 	struct ath10k_skb_cb *skb_cb;
 	struct ath10k_skb_cb *skb_cb;
 
 
 	skb = dev_alloc_skb(ATH10K_HTC_CONTROL_BUFFER_SIZE);
 	skb = dev_alloc_skb(ATH10K_HTC_CONTROL_BUFFER_SIZE);
-	if (!skb) {
-		ath10k_warn(ar, "Unable to allocate ctrl skb\n");
+	if (!skb)
 		return NULL;
 		return NULL;
-	}
 
 
 	skb_reserve(skb, 20); /* FIXME: why 20 bytes? */
 	skb_reserve(skb, 20); /* FIXME: why 20 bytes? */
 	WARN_ONCE((unsigned long)skb->data & 3, "unaligned skb");
 	WARN_ONCE((unsigned long)skb->data & 3, "unaligned skb");
@@ -806,10 +804,8 @@ struct sk_buff *ath10k_htc_alloc_skb(struct ath10k *ar, int size)
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 
 
 	skb = dev_alloc_skb(size + sizeof(struct ath10k_htc_hdr));
 	skb = dev_alloc_skb(size + sizeof(struct ath10k_htc_hdr));
-	if (!skb) {
-		ath10k_warn(ar, "could not allocate HTC tx skb\n");
+	if (!skb)
 		return NULL;
 		return NULL;
-	}
 
 
 	skb_reserve(skb, sizeof(struct ath10k_htc_hdr));
 	skb_reserve(skb, sizeof(struct ath10k_htc_hdr));
 
 

+ 1 - 0
drivers/net/wireless/ath/ath10k/htt.h

@@ -1031,6 +1031,7 @@ static inline struct htt_stats_conf_item *htt_stats_conf_next_item(
 {
 {
 	return (void *)item + sizeof(*item) + roundup(item->length, 4);
 	return (void *)item + sizeof(*item) + roundup(item->length, 4);
 }
 }
+
 /*
 /*
  * host -> target FRAG DESCRIPTOR/MSDU_EXT DESC bank
  * host -> target FRAG DESCRIPTOR/MSDU_EXT DESC bank
  *
  *

+ 2 - 2
drivers/net/wireless/ath/ath10k/htt_rx.c

@@ -132,7 +132,7 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
 	dma_addr_t paddr;
 	dma_addr_t paddr;
 	int ret = 0, idx;
 	int ret = 0, idx;
 
 
-	idx = __le32_to_cpu(*(htt->rx_ring.alloc_idx.vaddr));
+	idx = __le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr);
 	while (num > 0) {
 	while (num > 0) {
 		skb = dev_alloc_skb(HTT_RX_BUF_SIZE + HTT_RX_DESC_ALIGN);
 		skb = dev_alloc_skb(HTT_RX_BUF_SIZE + HTT_RX_DESC_ALIGN);
 		if (!skb) {
 		if (!skb) {
@@ -170,7 +170,7 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num)
 	}
 	}
 
 
 fail:
 fail:
-	*(htt->rx_ring.alloc_idx.vaddr) = __cpu_to_le32(idx);
+	*htt->rx_ring.alloc_idx.vaddr = __cpu_to_le32(idx);
 	return ret;
 	return ret;
 }
 }
 
 

+ 1 - 1
drivers/net/wireless/ath/ath10k/pci.c

@@ -631,7 +631,7 @@ static int __ath10k_pci_diag_read_hi(struct ath10k *ar, void *dest,
 }
 }
 
 
 #define ath10k_pci_diag_read_hi(ar, dest, src, len)		\
 #define ath10k_pci_diag_read_hi(ar, dest, src, len)		\
-	__ath10k_pci_diag_read_hi(ar, dest, HI_ITEM(src), len);
+	__ath10k_pci_diag_read_hi(ar, dest, HI_ITEM(src), len)
 
 
 static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
 static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address,
 				     const void *data, int nbytes)
 				     const void *data, int nbytes)

+ 2 - 2
drivers/net/wireless/ath/ath10k/wmi.c

@@ -3590,8 +3590,8 @@ ath10k_wmi_vdev_start_restart(struct ath10k *ar,
 	cmd->chan.antenna_max = arg->channel.max_antenna_gain;
 	cmd->chan.antenna_max = arg->channel.max_antenna_gain;
 
 
 	ath10k_dbg(ar, ATH10K_DBG_WMI,
 	ath10k_dbg(ar, ATH10K_DBG_WMI,
-		   "wmi vdev %s id 0x%x flags: 0x%0X, freq %d, mode %d, "
-		   "ch_flags: 0x%0X, max_power: %d\n", cmdname, arg->vdev_id,
+		   "wmi vdev %s id 0x%x flags: 0x%0X, freq %d, mode %d, ch_flags: 0x%0X, max_power: %d\n",
+		   cmdname, arg->vdev_id,
 		   flags, arg->channel.freq, arg->channel.mode,
 		   flags, arg->channel.freq, arg->channel.mode,
 		   cmd->chan.flags, arg->channel.max_power);
 		   cmd->chan.flags, arg->channel.max_power);