* [PATCH 1/2] ath10k: cosmetic cleanup to sdio files
@ 2019-10-24 9:54 Kalle Valo
2019-10-24 9:54 ` [PATCH 2/2] ath10k: sdio: remove struct ath10k_sdio_rx_data::status Kalle Valo
2019-11-25 11:51 ` [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Kalle Valo @ 2019-10-24 9:54 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless
Do some cosmetic cleanup while reviewing the files. No functional changes.
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/sdio.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index c34637881219..ef16b45c18da 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -541,10 +541,8 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar,
int pkt_cnt = 0;
if (n_lookaheads > ATH10K_SDIO_MAX_RX_MSGS) {
- ath10k_warn(ar,
- "the total number of pkgs to be fetched (%u) exceeds maximum %u\n",
- n_lookaheads,
- ATH10K_SDIO_MAX_RX_MSGS);
+ ath10k_warn(ar, "the total number of pkgs to be fetched (%u) exceeds maximum %u\n",
+ n_lookaheads, ATH10K_SDIO_MAX_RX_MSGS);
ret = -ENOMEM;
goto err;
}
@@ -553,10 +551,8 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar,
htc_hdr = (struct ath10k_htc_hdr *)&lookaheads[i];
last_in_bundle = false;
- if (le16_to_cpu(htc_hdr->len) >
- ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH) {
- ath10k_warn(ar,
- "payload length %d exceeds max htc length: %zu\n",
+ if (le16_to_cpu(htc_hdr->len) > ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH) {
+ ath10k_warn(ar, "payload length %d exceeds max htc length: %zu\n",
le16_to_cpu(htc_hdr->len),
ATH10K_HTC_MBOX_MAX_PAYLOAD_LENGTH);
ret = -ENOMEM;
@@ -567,8 +563,7 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar,
full_len = ath10k_sdio_calc_txrx_padded_len(ar_sdio, act_len);
if (full_len > ATH10K_SDIO_MAX_BUFFER_SIZE) {
- ath10k_warn(ar,
- "rx buffer requested with invalid htc_hdr length (%d, 0x%x): %d\n",
+ ath10k_warn(ar, "rx buffer requested with invalid htc_hdr length (%d, 0x%x): %d\n",
htc_hdr->eid, htc_hdr->flags,
le16_to_cpu(htc_hdr->len));
ret = -EINVAL;
@@ -590,12 +585,14 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar,
&bndl_cnt);
if (ret) {
- ath10k_warn(ar, "alloc_bundle error %d\n", ret);
+ ath10k_warn(ar, "failed to allocate a bundle: %d\n",
+ ret);
goto err;
}
pkt_cnt += bndl_cnt;
- /*Next buffer will be the last in the bundle */
+
+ /* next buffer will be the last in the bundle */
last_in_bundle = true;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] ath10k: sdio: remove struct ath10k_sdio_rx_data::status
2019-10-24 9:54 [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
@ 2019-10-24 9:54 ` Kalle Valo
2019-11-25 11:51 ` [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2019-10-24 9:54 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless
It seems to be unused.
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/sdio.c | 2 --
drivers/net/wireless/ath/ath10k/sdio.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/sdio.c b/drivers/net/wireless/ath/ath10k/sdio.c
index ef16b45c18da..ceeee465a73a 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.c
+++ b/drivers/net/wireless/ath/ath10k/sdio.c
@@ -649,7 +649,6 @@ static int ath10k_sdio_mbox_rx_fetch(struct ath10k *ar)
htc_hdr = (struct ath10k_htc_hdr *)skb->data;
pkt->act_len = le16_to_cpu(htc_hdr->len) + sizeof(*htc_hdr);
- pkt->status = ret;
skb_put(skb, pkt->act_len);
return ret;
@@ -687,7 +686,6 @@ static int ath10k_sdio_mbox_rx_fetch_bundle(struct ath10k *ar)
pkt->act_len = le16_to_cpu(htc_hdr->len) + sizeof(*htc_hdr);
skb_put_data(pkt->skb, htc_hdr, pkt->act_len);
- pkt->status = 0;
pkt_offset += pkt->alloc_len;
}
diff --git a/drivers/net/wireless/ath/ath10k/sdio.h b/drivers/net/wireless/ath/ath10k/sdio.h
index 9acaf0229cf2..33195f49acab 100644
--- a/drivers/net/wireless/ath/ath10k/sdio.h
+++ b/drivers/net/wireless/ath/ath10k/sdio.h
@@ -126,7 +126,6 @@ struct ath10k_sdio_rx_data {
bool part_of_bundle;
bool last_in_bundle;
bool trailer_only;
- int status;
};
struct ath10k_sdio_irq_proc_regs {
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] ath10k: cosmetic cleanup to sdio files
2019-10-24 9:54 [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
2019-10-24 9:54 ` [PATCH 2/2] ath10k: sdio: remove struct ath10k_sdio_rx_data::status Kalle Valo
@ 2019-11-25 11:51 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2019-11-25 11:51 UTC (permalink / raw)
To: Kalle Valo; +Cc: ath10k, linux-wireless
Kalle Valo <kvalo@codeaurora.org> wrote:
> Do some cosmetic cleanup while reviewing the files. No functional changes.
>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
2 patches applied to ath-next branch of ath.git, thanks.
efd2f4c5016b ath10k: sdio: cosmetic cleanup
2246c2156590 ath10k: sdio: remove struct ath10k_sdio_rx_data::status
--
https://patchwork.kernel.org/patch/11208761/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-25 11:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-24 9:54 [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
2019-10-24 9:54 ` [PATCH 2/2] ath10k: sdio: remove struct ath10k_sdio_rx_data::status Kalle Valo
2019-11-25 11:51 ` [PATCH 1/2] ath10k: cosmetic cleanup to sdio files Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).