From patchwork Thu Aug 8 13:03:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maharaja Kennadyrajan X-Patchwork-Id: 11084119 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3E8817E0 for ; Thu, 8 Aug 2019 13:03:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B07BD28B4D for ; Thu, 8 Aug 2019 13:03:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A507C288D4; Thu, 8 Aug 2019 13:03:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 328E7288B5 for ; Thu, 8 Aug 2019 13:03:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=rEw+7Wbbhe5UmSARBlP0DLZpnIKAxpPCxAAo3nek5LM=; b=JYlTqgTuCupCKIJAOi63nBNr9C Wey3IhAzOvWo2b62QiFN0Ai6ukwH/J0OfzGaSrgx0VhgOsp4yp/K0ZotDjKB3nsIRMkNVoMXa5meB 9zcTHCyYvKYgjltLsDbPasPXnTzGKCFzm1QwV2RUXlolsc/SETa3R1K34LC0VvNQOK2/OO6EufiOi yhYhrRwXcjLXED4Gsjy5aGQIm6IZ3ZGoCol1lwFAGdraffqSISCWhYvN81U+VEXn5qGyPbJa+TcFg +wL9/OObEQGEiKPgt+OpGvKVGigONKgS3OkdxxF5cItBWu7kmunmPgfIuzKbOWi3GsauwOVUEJVQa DOuIUfrA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hvi4p-0008Gv-GO; Thu, 08 Aug 2019 13:03:31 +0000 Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hvi4h-00087K-Hm for ath11k@lists.infradead.org; Thu, 08 Aug 2019 13:03:25 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 44F1060A42; Thu, 8 Aug 2019 13:03:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1565269403; bh=5a5DrhfV2kWByBRqBoSTo0NBNqDfYRw+6m4hRhZEt+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J++1hmigxHwyaT2QIJrq5VdWCAXA1IdFFOJYh4gb15QHEqPiEPa+D2Oxs9qWKFmn2 uznlnqjQaggGK3OSfN0xl0OtMyi18adA6iAf5/t1+XjTM+o5E0qElop4T1fobopgkT 1mbVTy8kR8ODp+QcnfAigykuDAJOOG1tAXyiulZc= Received: from che-swdbs-01.qca.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mkenna@codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 9F69060867; Thu, 8 Aug 2019 13:03:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1565269402; bh=5a5DrhfV2kWByBRqBoSTo0NBNqDfYRw+6m4hRhZEt+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ti66zQvkG82isdMOBkWwsco/6aQG5EsqLkokjM/BCyFNpJ/91dbHZNhwWO4avWR8f 7Cj7eagG30dowbOkxtHLv/rPVDOYRaCUkk+1vdeBpkXyGwn9m4d4QHKxYbO5RMPeY3 X4+5h0BWHHkWetyZ5r+pvNfjLEEYUdFXXGsuKT5M= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 9F69060867 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=mkenna@codeaurora.org From: Maharaja Kennadyrajan To: ath11k@lists.infradead.org Subject: [PATCH 08/15] ath11k: Rename ath11k_base struct from 'sc' to 'ab in dp.c Date: Thu, 8 Aug 2019 18:33:05 +0530 Message-Id: <1565269392-2838-9-git-send-email-mkenna@codeaurora.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1565269392-2838-1-git-send-email-mkenna@codeaurora.org> References: <1565269392-2838-1-git-send-email-mkenna@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190808_060323_756397_5A5CB910 X-CRM114-Status: GOOD ( 12.51 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maharaja Kennadyrajan MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To avoid confusion and better readability, renamed the ath11k_base struct from 'sc' to 'ab' in dp.c file. Signed-off-by: Maharaja Kennadyrajan --- drivers/net/wireless/ath/ath11k/dp.c | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/dp.c b/drivers/net/wireless/ath/ath11k/dp.c index 18a354d75d00..b55d9d023a55 100644 --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c @@ -11,7 +11,7 @@ #include "dp_rx.h" #include "peer.h" -static void ath11k_dp_htt_htc_tx_complete(struct ath11k_base *sc, +static void ath11k_dp_htt_htc_tx_complete(struct ath11k_base *ab, struct sk_buff *skb) { dev_kfree_skb_any(skb); @@ -745,7 +745,7 @@ int ath11k_dp_htt_connect(struct ath11k_dp *dp) /* connect to control service */ conn_req.service_id = ATH11K_HTC_SVC_ID_HTT_DATA_MSG; - status = ath11k_htc_connect_service(&dp->sc->htc, &conn_req, + status = ath11k_htc_connect_service(&dp->ab->htc, &conn_req, &conn_resp); if (status) @@ -805,22 +805,22 @@ static int ath11k_dp_tx_pending_cleanup(int buf_id, void *skb, void *ctx) return 0; } -void ath11k_dp_free(struct ath11k_base *sc) +void ath11k_dp_free(struct ath11k_base *ab) { - struct ath11k_dp *dp = &sc->dp; + struct ath11k_dp *dp = &ab->dp; int i; - ath11k_dp_link_desc_cleanup(sc, dp->link_desc_banks, + ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); - ath11k_dp_srng_common_cleanup(sc); + ath11k_dp_srng_common_cleanup(ab); - ath11k_dp_reo_cmd_list_cleanup(sc); + ath11k_dp_reo_cmd_list_cleanup(ab); for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { spin_lock_bh(&dp->tx_ring[i].tx_idr_lock); idr_for_each(&dp->tx_ring[i].txbuf_idr, - ath11k_dp_tx_pending_cleanup, sc); + ath11k_dp_tx_pending_cleanup, ab); idr_destroy(&dp->tx_ring[i].txbuf_idr); spin_unlock_bh(&dp->tx_ring[i].tx_idr_lock); @@ -832,37 +832,37 @@ void ath11k_dp_free(struct ath11k_base *sc) /* Deinit any SOC level resource */ } -int ath11k_dp_alloc(struct ath11k_base *sc) +int ath11k_dp_alloc(struct ath11k_base *ab) { - struct ath11k_dp *dp = &sc->dp; + struct ath11k_dp *dp = &ab->dp; struct hal_srng *srng = NULL; size_t size = 0; u32 n_link_desc = 0; int ret; int i; - dp->sc = sc; + dp->ab = ab; INIT_LIST_HEAD(&dp->reo_cmd_list); INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list); spin_lock_init(&dp->reo_cmd_lock); - ret = ath11k_wbm_idle_ring_setup(sc, &n_link_desc); + ret = ath11k_wbm_idle_ring_setup(ab, &n_link_desc); if (ret) { - ath11k_warn(sc, "failed to setup wbm_idle_ring: %d\n", ret); + ath11k_warn(ab, "failed to setup wbm_idle_ring: %d\n", ret); return ret; } - srng = &sc->hal.srng_list[dp->wbm_idle_ring.ring_id]; + srng = &ab->hal.srng_list[dp->wbm_idle_ring.ring_id]; - ret = ath11k_dp_link_desc_setup(sc, dp->link_desc_banks, + ret = ath11k_dp_link_desc_setup(ab, dp->link_desc_banks, HAL_WBM_IDLE_LINK, srng, n_link_desc); if (ret) { - ath11k_warn(sc, "failed to setup link desc: %d\n", ret); + ath11k_warn(ab, "failed to setup link desc: %d\n", ret); return ret; } - ret = ath11k_dp_srng_common_setup(sc); + ret = ath11k_dp_srng_common_setup(ab); if (ret) goto fail_link_desc_cleanup; @@ -881,17 +881,17 @@ int ath11k_dp_alloc(struct ath11k_base *sc) } for (i = 0; i < HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++) - ath11k_hal_tx_set_dscp_tid_map(sc, i); + ath11k_hal_tx_set_dscp_tid_map(ab, i); /* Init any SOC level resource for DP */ return 0; fail_cmn_srng_cleanup: - ath11k_dp_srng_common_cleanup(sc); + ath11k_dp_srng_common_cleanup(ab); fail_link_desc_cleanup: - ath11k_dp_link_desc_cleanup(sc, dp->link_desc_banks, + ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); return ret;