From: Dmitry Antipov <dmantipov@yandex.ru>
To: Jeff Johnson <quic_jjohnson@quicinc.com>
Cc: Kalle Valo <kvalo@kernel.org>,
linux-wireless@vger.kernel.org, lvc-project@linuxtesting.org,
ath10k@lists.infradead.org, Dmitry Antipov <dmantipov@yandex.ru>
Subject: [PATCH 2/6] [v3] wifi: ath10k: simplify ath10k_ce_init_pipe()
Date: Thu, 24 Aug 2023 08:51:07 +0300 [thread overview]
Message-ID: <20230824055117.42309-2-dmantipov@yandex.ru> (raw)
In-Reply-To: <20230824055117.42309-1-dmantipov@yandex.ru>
Convert 'ath10k_ce_init_pipe()' to return 'void' and thus
simplify 'ath10k_pci_init_pipes()' and 'ath10k_snoc_init_pipes()'.
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v3: split from the larger v2 patch
---
drivers/net/wireless/ath/ath10k/ce.c | 6 ++----
drivers/net/wireless/ath/ath10k/ce.h | 4 ++--
drivers/net/wireless/ath/ath10k/pci.c | 12 +++---------
drivers/net/wireless/ath/ath10k/snoc.c | 12 +++---------
4 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index ace92c636733..73aa3632b23c 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -1655,16 +1655,14 @@ ath10k_ce_alloc_dest_ring_64(struct ath10k *ar, unsigned int ce_id,
* initialization. It may be that only one side or the other is
* initialized by software/firmware.
*/
-int ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id,
- const struct ce_attr *attr)
+void ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id,
+ const struct ce_attr *attr)
{
if (attr->src_nentries)
ath10k_ce_init_src_ring(ar, ce_id, attr);
if (attr->dest_nentries)
ath10k_ce_init_dest_ring(ar, ce_id, attr);
-
- return 0;
}
EXPORT_SYMBOL(ath10k_ce_init_pipe);
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index 666ce384a1d8..a0b408176f7f 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -220,8 +220,8 @@ int ath10k_ce_completed_send_next_nolock(struct ath10k_ce_pipe *ce_state,
/*==================CE Engine Initialization=======================*/
-int ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id,
- const struct ce_attr *attr);
+void ath10k_ce_init_pipe(struct ath10k *ar, unsigned int ce_id,
+ const struct ce_attr *attr);
void ath10k_ce_deinit_pipe(struct ath10k *ar, unsigned int ce_id);
int ath10k_ce_alloc_pipe(struct ath10k *ar, int ce_id,
const struct ce_attr *attr);
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index a7f44f6335fb..8e05326400bb 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2527,16 +2527,10 @@ void ath10k_pci_free_pipes(struct ath10k *ar)
int ath10k_pci_init_pipes(struct ath10k *ar)
{
struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);
- int i, ret;
+ int i;
- for (i = 0; i < CE_COUNT; i++) {
- ret = ath10k_ce_init_pipe(ar, i, &ar_pci->attr[i]);
- if (ret) {
- ath10k_err(ar, "failed to initialize copy engine pipe %d: %d\n",
- i, ret);
- return ret;
- }
- }
+ for (i = 0; i < CE_COUNT; i++)
+ ath10k_ce_init_pipe(ar, i, &ar_pci->attr[i]);
return 0;
}
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index 26214c00cd0d..4f835ad60080 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -941,16 +941,10 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)
static int ath10k_snoc_init_pipes(struct ath10k *ar)
{
- int i, ret;
+ int i;
- for (i = 0; i < CE_COUNT; i++) {
- ret = ath10k_ce_init_pipe(ar, i, &host_ce_config_wlan[i]);
- if (ret) {
- ath10k_err(ar, "failed to initialize copy engine pipe %d: %d\n",
- i, ret);
- return ret;
- }
- }
+ for (i = 0; i < CE_COUNT; i++)
+ ath10k_ce_init_pipe(ar, i, &host_ce_config_wlan[i]);
return 0;
}
--
2.41.0
next prev parent reply other threads:[~2023-08-24 5:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-23 9:50 [PATCH] [v2] wifi: ath10k: cleanup CE initialization Dmitry Antipov
2023-08-23 9:50 ` [PATCH 2/3] [v2] wifi: ath10k: simplify ath10k_peer_assoc_h_vht() Dmitry Antipov
2023-08-23 14:55 ` Jeff Johnson
2023-08-23 9:50 ` [PATCH 3/3] [v2] wifi: ath10k: simplify ath10k_pci_pm_suspend() Dmitry Antipov
2023-08-23 14:57 ` Jeff Johnson
2023-08-23 10:03 ` [lvc-project] [PATCH] [v2] wifi: ath10k: cleanup CE initialization Alexey Khoroshilov
2023-08-23 10:13 ` Antipov, Dmitriy
2023-08-25 7:47 ` Kalle Valo
2023-08-23 14:53 ` Jeff Johnson
2023-08-24 5:51 ` [PATCH 1/6] [v3] wifi: ath10k: cleanup CE ring initialization Dmitry Antipov
2023-08-24 5:51 ` Dmitry Antipov [this message]
2023-08-24 15:26 ` [PATCH 2/6] [v3] wifi: ath10k: simplify ath10k_ce_init_pipe() Jeff Johnson
2023-08-24 5:51 ` [PATCH 3/6] [v3] wifi: ath10k: cleanup CE pipes initialization Dmitry Antipov
2023-08-24 15:27 ` Jeff Johnson
2023-08-24 5:51 ` [PATCH 4/6] [v3] wifi: ath10k: do not ignore possible dma_alloc_coherent() error Dmitry Antipov
2023-08-24 15:27 ` Jeff Johnson
2023-08-24 5:51 ` [PATCH 5/6] [v3] wifi: ath10k: simplify ath10k_peer_assoc_h_vht() Dmitry Antipov
2023-08-24 5:51 ` [PATCH 6/6] [v3] wifi: ath10k: simplify ath10k_pci_pm_suspend() Dmitry Antipov
2023-08-24 15:26 ` [PATCH 1/6] [v3] wifi: ath10k: cleanup CE ring initialization Jeff Johnson
2023-09-20 13:23 ` Kalle Valo
2023-09-21 8:58 ` Dmitry Antipov
2023-09-21 9:33 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230824055117.42309-2-dmantipov@yandex.ru \
--to=dmantipov@yandex.ru \
--cc=ath10k@lists.infradead.org \
--cc=kvalo@kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lvc-project@linuxtesting.org \
--cc=quic_jjohnson@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).