On 8/23/2023 10:51 PM, Dmitry Antipov wrote:
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 <dmanti...@yandex.ru>
Acked-by: Jeff Johnson <quic_jjohn...@quicinc.com>
---
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;
}
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
